Chronological Thread  

< Chronological >       < Thread >

---

Author: niclas AT hedhman.org
Date: Sun Jun 12 09:47:29 2005
New Revision: 2828

Added:

development/laboratory/users/niclas/osgi/unit/src/main/net/dpml/metro/unit/TestConfigurationBuilder.java
- copied unchanged from r2825,
qa/main/2450fork-rc/metro/classic/unit/src/main/net/dpml/metro/unit/TestConfigurationBuilder.java

development/laboratory/users/niclas/osgi/unit/src/main/net/dpml/metro/unit/TestContext.java
- copied, changed from r2825,
qa/main/2450fork-rc/metro/classic/unit/src/main/net/dpml/metro/unit/TestContext.java

development/laboratory/users/niclas/osgi/unit/src/main/net/dpml/metro/unit/TestLogger.java
- copied, changed from r2825,
qa/main/2450fork-rc/metro/classic/unit/src/main/net/dpml/metro/unit/TestLogger.java

development/laboratory/users/niclas/osgi/unit/src/main/net/dpml/metro/unit/TestParametersBuilder.java
- copied unchanged from r2825,
qa/main/2450fork-rc/metro/classic/unit/src/main/net/dpml/metro/unit/TestParametersBuilder.java

development/laboratory/users/niclas/osgi/unit/src/main/net/dpml/metro/unit/TestServiceManager.java
- copied, changed from r2825,
qa/main/2450fork-rc/metro/classic/unit/src/main/net/dpml/metro/unit/TestServiceManager.java
Removed:

development/laboratory/users/niclas/osgi/activation/impl/etc/test/secure.xml

development/laboratory/users/niclas/osgi/activation/impl/etc/test/security.policy

development/laboratory/users/niclas/osgi/activation/impl/etc/test/test.properties
development/laboratory/users/niclas/osgi/activation/providers/avalon/

development/laboratory/users/niclas/osgi/activation/test/etc/test/security.policy

development/laboratory/users/niclas/osgi/activation/test/src/test/net/dpml/activation/impl/test/CodeSecurityDisabledTestCase.java

development/laboratory/users/niclas/osgi/activation/test/src/test/net/dpml/activation/impl/test/CodeSecurityEnabledTestCase.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/PermissionDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/SecurityProfile.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/StageDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/info/DeliveryDescriptor.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/info/InjectorDeliveryDescriptor.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/info/NativeDeliveryDescriptor.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/info/NullDeliveryDescriptor.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/info/StagedDeliveryDescriptor.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/info/package.html

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ContextualizationHandler.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/Dependent.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/LifecycleCreateExtension.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/LifecycleDestroyExtension.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/StageModel.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLSecurityProfileBuilder.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDependent.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultSecurityModel.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultStageModel.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/SecurityModel.java

development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/DefaultImmutableConfiguration.java

development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/MutableConfiguration.java
development/laboratory/users/niclas/osgi/extension/

development/laboratory/users/niclas/osgi/logging/providers/log4j/impl/build.properties

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/build.properties

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/ExtensionDescriptor.java

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/PermissionDescriptor.java

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/SecurityDescriptor.java

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/StageDescriptor.java

development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ExtensionDescriptorTestCase.java

development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/PermissionDescriptorTestCase.java

development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/SecurityDescriptorTestCase.java

development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/StageDescriptorTestCase.java

development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/XMLLegacyCreator.java

development/laboratory/users/niclas/osgi/meta/impl/src/test/net/dpml/meta/compat/

development/laboratory/users/niclas/osgi/meta/impl/src/test/net/dpml/meta/legacy/

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/ExtensionTag.java

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/SecurityTag.java

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/StageTag.java

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/DemoManager.java

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/Demonstratable.java

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/Exploitable.java

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/ExploitationManager.java
Modified:

development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/Appliance.java

development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/ApplianceException.java

development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/ApplianceRuntimeException.java

development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/ComponentFactory.java

development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/LifecycleException.java

development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/LifecycleRuntimeException.java

development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/LifestyleException.java

development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/LifestyleRuntimeException.java

development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/RuntimeFactory.java

development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/RuntimeFactoryException.java

development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/TransientApplianceException.java
development/laboratory/users/niclas/osgi/activation/impl/build.xml

development/laboratory/users/niclas/osgi/activation/impl/etc/test/logging.xml

development/laboratory/users/niclas/osgi/activation/impl/etc/test/playground.xml

development/laboratory/users/niclas/osgi/activation/impl/etc/test/system/kernel.xml

development/laboratory/users/niclas/osgi/activation/impl/etc/test/system/logging.xml

development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/AbstractAppliance.java

development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/DefaultBlock.java

development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/DefaultRuntime.java

development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/DefaultState.java

development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/Resources.properties

development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/AbstractAppliance.java

development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/AbstractLifestyleManager.java

development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/ApplianceInvocationHandler.java

development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/ContainerUtil.java

development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultAppliance.java

development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultComponentFactory.java

development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultLifestyleFactory.java

development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultRuntimeFactory.java

development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultServiceManager.java

development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/Resources.properties

development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/SingletonLifestyleManager.java

development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/ThreadLifestyleManager.java

development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/TransientLifestyleManager.java
development/laboratory/users/niclas/osgi/activation/test/build.xml

development/laboratory/users/niclas/osgi/activation/test/etc/test/kernel.xml

development/laboratory/users/niclas/osgi/activation/test/etc/test/logging.xml

development/laboratory/users/niclas/osgi/activation/test/src/test/net/dpml/activation/impl/test/PlaygroundTestCase.java

development/laboratory/users/niclas/osgi/activity/api/src/main/net/dpml/activity/Disposable.java

development/laboratory/users/niclas/osgi/activity/api/src/main/net/dpml/activity/Executable.java

development/laboratory/users/niclas/osgi/activity/api/src/main/net/dpml/activity/Initializable.java

development/laboratory/users/niclas/osgi/activity/api/src/main/net/dpml/activity/Startable.java
development/laboratory/users/niclas/osgi/build.xml

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/BlockCompositionDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/BlockIncludeDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ClassLoaderDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ClasspathDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ComponentProfile.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ConstructorDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ContainmentProfile.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ContextDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/DependencyDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/DeploymentProfile.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/EntryDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ExcludeDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/FilesetDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ImportDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/IncludeDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/LibraryDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/MetaDataException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/MetaDataRuntimeException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/Mode.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/NamedComponentProfile.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/Parameter.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ProfilePackage.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/SelectionDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ServiceDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/TargetDirective.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/Targets.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/event/CompositionEvent.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/event/CompositionListener.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/AssemblyException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ClassLoaderModel.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/Commissionable.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/CommissioningException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ComponentModel.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/CompositionException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ContainmentModel.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ContextModel.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/DependencyGraph.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/DependencyModel.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/DeploymentModel.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/DuplicateNameException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/EntryModel.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/FatalCommissioningException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/FileSelector.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/FilesetModel.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ModelException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ModelRepository.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ModelRuntimeException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ModelSelector.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProfileDuplicateException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProfileException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProfileSelector.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProfileUnknownException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProviderNotFoundException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/Reclaimer.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/Resolver.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ServiceDuplicateException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ServiceException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ServiceModel.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ServiceRepository.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TransientRuntimeException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeDuplicateException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeRepository.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeRuntimeException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeUnknownException.java

development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/UnknownServiceException.java

development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ComponentProfileTestCase.java

development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ConstructorDirectiveTestCase.java

development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ContextDirectiveTestCase.java

development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ImportDirectiveTestCase.java

development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/MetaDataExceptionTestCase.java

development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ParameterTestCase.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/CompositionContentHandlerFactory.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/ContainmentProfileBuilder.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/ProfilePackageBuilder.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/SerializedContainmentProfileCreator.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/SerializedProfilePackageCreator.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/SerializedTargetsCreator.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/TargetsBuilder.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLComponentProfileCreator.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLContainmentProfileCreator.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLProfileCreator.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLProfilePackageCreator.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLTargetsCreator.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/writer/SerializedContainmentProfileWriter.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/writer/XMLComponentProfileWriter.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/writer/XMLContainmentProfileWriter.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/CommissionRequest.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/Commissioner.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultClassLoaderContext.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultClassLoaderModel.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultComponentContext.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultComponentModel.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionContext.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionController.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionCriteria.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionFactory.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultConstructorModel.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentContext.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModel.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModelAssemblyHelper.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModelComponentHelper.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModelExportHelper.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModelNavigationHelper.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContextMap.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContextModel.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDependencyModel.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDeploymentContext.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDeploymentModel.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultEntryModel.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultFilesetModel.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultImportModel.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultModelFactory.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultModelRepository.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultModelSelector.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultProfileSelector.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultServiceModel.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultServiceRepository.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultState.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultTypeRepository.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DirectoryScanner.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/OverrideEntryModel.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/Resource.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/Resources.properties

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/Scanner.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/ScannerUtils.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/SimpleFIFO.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/util/FileUtils.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/util/Resource.java

development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/util/ScannerUtils.java

development/laboratory/users/niclas/osgi/composition/impl/src/test/net/dpml/composition/model/builder/ContentHandlerTestCase.java

development/laboratory/users/niclas/osgi/composition/impl/src/test/net/dpml/composition/model/impl/SimpleDeploymentModel.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/data/builder/ContainmentProfileCreator.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/data/builder/ProfilePackageCreator.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/data/builder/TargetsCreator.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/data/writer/ContainmentProfileWriter.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/ClassLoaderContext.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/ComponentContext.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionContext.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionCriteria.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionException.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionFactory.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionHelper.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionRuntimeException.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/ContainmentContext.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/DeploymentContext.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/LifestyleFactory.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/LifestyleManager.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/ModelFactory.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/Runtime.java

development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/util/DefaultState.java
development/laboratory/users/niclas/osgi/composition/test/build.xml

development/laboratory/users/niclas/osgi/composition/test/etc/test/context.xml

development/laboratory/users/niclas/osgi/composition/test/etc/test/cyclicdeps.xml

development/laboratory/users/niclas/osgi/composition/test/etc/test/dependency.xml

development/laboratory/users/niclas/osgi/composition/test/etc/test/dynamics.xml

development/laboratory/users/niclas/osgi/composition/test/etc/test/metro.properties

development/laboratory/users/niclas/osgi/composition/test/etc/test/schemavalidation.xml

development/laboratory/users/niclas/osgi/composition/test/etc/test/schemavalidation_failing.xml

development/laboratory/users/niclas/osgi/composition/test/etc/test/targets-config.xml

development/laboratory/users/niclas/osgi/composition/test/etc/test/targets.xml

development/laboratory/users/niclas/osgi/composition/test/src/main/net/dpml/composition/test/CompositionTestCase.java

development/laboratory/users/niclas/osgi/composition/test/src/test/net/dpml/composition/model/impl/test/ContextTestCase.java

development/laboratory/users/niclas/osgi/configuration/api/src/main/net/dpml/configuration/Configurable.java

development/laboratory/users/niclas/osgi/configuration/api/src/main/net/dpml/configuration/Configuration.java

development/laboratory/users/niclas/osgi/configuration/api/src/main/net/dpml/configuration/ConfigurationException.java

development/laboratory/users/niclas/osgi/configuration/api/src/main/net/dpml/configuration/package.html

development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/AbstractConfiguration.java

development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/CascadingConfiguration.java

development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/ConfigurationUtil.java

development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/DefaultConfiguration.java

development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/DefaultConfigurationBuilder.java

development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/DefaultConfigurationSerializer.java

development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/NamespacedSAXConfigurationHandler.java

development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/SAXConfigurationHandler.java

development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/package.html

development/laboratory/users/niclas/osgi/configuration/impl/src/test/net/dpml/configuration/test/DefaultConfigurationBuilderTestCase.java

development/laboratory/users/niclas/osgi/configuration/impl/src/test/net/dpml/configuration/test/DefaultConfigurationSerializerTestCase.java

development/laboratory/users/niclas/osgi/configuration/impl/src/test/net/dpml/configuration/test/DefaultConfigurationTestCase.java

development/laboratory/users/niclas/osgi/configuration/impl/src/test/net/dpml/configuration/test/SAXConfigurationHandlerTestCase.java

development/laboratory/users/niclas/osgi/context/api/src/main/net/dpml/context/Context.java

development/laboratory/users/niclas/osgi/context/api/src/main/net/dpml/context/ContextException.java

development/laboratory/users/niclas/osgi/context/api/src/main/net/dpml/context/Contextualizable.java

development/laboratory/users/niclas/osgi/context/impl/src/main/net/dpml/context/impl/DefaultContext.java
development/laboratory/users/niclas/osgi/index.xml

development/laboratory/users/niclas/osgi/logging/api/src/main/net/dpml/logging/AbstractLogEnabled.java

development/laboratory/users/niclas/osgi/logging/api/src/main/net/dpml/logging/LogEnabled.java

development/laboratory/users/niclas/osgi/logging/api/src/main/net/dpml/logging/Logger.java

development/laboratory/users/niclas/osgi/logging/criteria/src/main/net/dpml/logging/criteria/ConfigurationParameter.java

development/laboratory/users/niclas/osgi/logging/criteria/src/main/net/dpml/logging/criteria/ConsoleLogger.java

development/laboratory/users/niclas/osgi/logging/criteria/src/main/net/dpml/logging/criteria/DefaultLoggingCriteria.java

development/laboratory/users/niclas/osgi/logging/criteria/src/main/net/dpml/logging/criteria/LoggerParameter.java

development/laboratory/users/niclas/osgi/logging/data/src/main/net/dpml/logging/data/CategoriesDirective.java

development/laboratory/users/niclas/osgi/logging/data/src/main/net/dpml/logging/data/CategoryDirective.java

development/laboratory/users/niclas/osgi/logging/data/src/test/net/dpml/logging/data/test/CategoriesDirectiveTestCase.java

development/laboratory/users/niclas/osgi/logging/data/src/test/net/dpml/logging/data/test/CategoryDirectiveTestCase.java

development/laboratory/users/niclas/osgi/logging/providers/log4j/impl/src/main/net/dpml/logging/log4j/Log4JLogger.java

development/laboratory/users/niclas/osgi/logging/providers/log4j/impl/src/main/net/dpml/logging/log4j/Log4JLoggingFactory.java

development/laboratory/users/niclas/osgi/logging/providers/log4j/impl/src/main/net/dpml/logging/log4j/LoggingManagerImpl.java

development/laboratory/users/niclas/osgi/logging/providers/log4j/test/etc/test/logging.properties

development/laboratory/users/niclas/osgi/logging/providers/log4j/test/etc/test/logging.xml

development/laboratory/users/niclas/osgi/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/AlternateLoggingManagerTestCase.java

development/laboratory/users/niclas/osgi/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/DefaultLoggingManagerTestCase.java

development/laboratory/users/niclas/osgi/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/LoggingManagerHelper.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/ContextMap.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/ErrorAware.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/ErrorHandler.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/Formatter.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/FormatterFactory.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogEvent.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTarget.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetException.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetFactory.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetFactoryBuilder.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetFactoryManager.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetManager.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/Logger.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LoggerListener.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/MissingIdException.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/Priority.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/UnknownLogTargetException.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/DefaultLogTargetFactoryManager.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/DefaultLogTargetManager.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/DefaultLoggingManager.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/Hierarchy.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/LogKitLogger.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/StandardFormatter.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/AbstractOutputTarget.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/AbstractTarget.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/FileTargetFactory.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/MulticastTargetFactory.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/PluginTargetFactory.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/StreamTargetFactory.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/FileTarget.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/SafeFileTarget.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/StreamTarget.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/WriterTarget.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/FileStrategy.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/OrRotateStrategy.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RevolvingFileStrategy.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategy.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategyByDate.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategyBySize.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategyByTime.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategyByTimeOfDay.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotatingFileTarget.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/UniqueFileStrategy.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/ExtendedPatternFormatter.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/PatternFormatter.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/RawFormatter.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/SyslogFormatter.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/XMLFormatter.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util/Closeable.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util/DefaultErrorHandler.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util/LoggerOutputStream.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util/StackIntrospector.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/datagram/src/main/net/dpml/logging/logkit/datagram/DatagramOutputTarget.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/datagram/src/main/net/dpml/logging/logkit/datagram/DatagramTargetFactory.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/socket/src/main/net/dpml/logging/logkit/socket/SocketOutputTarget.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/socket/src/main/net/dpml/logging/logkit/socket/SocketTargetFactory.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/syslog/src/main/net/dpml/logging/logkit/syslog/SyslogTarget.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/syslog/src/main/net/dpml/logging/logkit/syslog/SyslogTargetFactory.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test/DefaultLoggingManagerTestCase.java

development/laboratory/users/niclas/osgi/logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test/LoggingManagerHelper.java

development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/ConsoleLogger.java

development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingCriteria.java

development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingException.java

development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingFactory.java

development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingManager.java

development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingRuntimeException.java

development/laboratory/users/niclas/osgi/main/src/main/net/dpml/metro/Metro.java

development/laboratory/users/niclas/osgi/main/src/main/net/dpml/metro/Resources.properties
development/laboratory/users/niclas/osgi/meta/api/build.xml

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/CategoryDescriptor.java

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/ContextDescriptor.java

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/DependencyDescriptor.java

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/Descriptor.java

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/EntryDescriptor.java

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/InfoDescriptor.java

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/ReferenceDescriptor.java

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/Service.java

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/ServiceDescriptor.java

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/Type.java

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/Version.java

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/package.html

development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/type.dtd

development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/AbstractDescriptorTestCase.java

development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/CategoryDescriptorTestCase.java

development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ContextDescriptorTestCase.java

development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/DependencyDescriptorTestCase.java

development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/EntryDescriptorTestCase.java

development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/InfoDescriptorTestCase.java

development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ReferenceDescriptorTestCase.java

development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ServiceDescriptorTestCase.java

development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ServiceTestCase.java

development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/TypeTestCase.java

development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/Resources.properties

development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/SerializedServiceCreator.java

development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/SerializedTypeCreator.java

development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/ServiceBuilder.java

development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/TypeBuilder.java

development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/XMLServiceCreator.java

development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/XMLTypeCreator.java

development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/impl/ConfigurationBuilder.java

development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/impl/DTDInfo.java

development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/impl/DTDResolver.java

development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/verifier/impl/package.html

development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/writer/impl/SerializedServiceWriter.java

development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/writer/impl/SerializedTypeWriter.java

development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLServiceWriter.java

development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLTypeWriter.java

development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/builder/BuildException.java

development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/builder/ServiceCreator.java

development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/builder/TypeCreator.java

development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/builder/TypeFactory.java

development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/locator/ResourceLocator.java

development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/verifier/Verifier.java

development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/verifier/VerifyException.java

development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/writer/ServiceWriter.java

development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/writer/TypeWriter.java

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/ant/FormatEnum.java

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/ant/MetaBuildListener.java

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/ant/MetaTask.java

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/ant/package.html

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/AbstractTag.java

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/AttributeTag.java

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/ContextTag.java

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/DependencyTag.java

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/LoggerTag.java

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/SchemaTag.java

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/ServiceTag.java

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/ServicesTag.java

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/Tags.java

development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/TypeTag.java

development/laboratory/users/niclas/osgi/meta/tools/src/test/net/dpml/meta/test/MetaTestCase.java
development/laboratory/users/niclas/osgi/module.xml

development/laboratory/users/niclas/osgi/parameters/api/src/main/net/dpml/parameters/ParameterException.java

development/laboratory/users/niclas/osgi/parameters/api/src/main/net/dpml/parameters/Parameterizable.java

development/laboratory/users/niclas/osgi/parameters/api/src/main/net/dpml/parameters/Parameters.java

development/laboratory/users/niclas/osgi/parameters/impl/src/main/net/dpml/parameters/impl/DefaultParameters.java

development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/FatalServiceException.java

development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/ServiceException.java

development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/ServiceManager.java

development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/ServiceUnknownException.java

development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/Serviceable.java

development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/TransientServiceException.java

development/laboratory/users/niclas/osgi/system/api/src/main/net/dpml/system/CascadingIOException.java

development/laboratory/users/niclas/osgi/system/api/src/main/net/dpml/system/Factory.java

development/laboratory/users/niclas/osgi/system/api/src/main/net/dpml/system/SystemException.java

development/laboratory/users/niclas/osgi/system/api/src/main/net/dpml/system/SystemRuntimeException.java

development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/impl/DefaultSystemContext.java

development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/impl/DefaultSystemContextFactory.java

development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/impl/DefaultSystemCriteria.java

development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/monitors/CacheMonitorLoggerAdapter.java

development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/monitors/ConnectionMonitorLoggerAdapter.java

development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/monitors/NetworkMonitorLoggerAdapter.java

development/laboratory/users/niclas/osgi/system/spi/src/main/net/dpml/system/Resources.properties

development/laboratory/users/niclas/osgi/system/spi/src/main/net/dpml/system/SystemContext.java

development/laboratory/users/niclas/osgi/system/spi/src/main/net/dpml/system/SystemContextFactory.java

development/laboratory/users/niclas/osgi/system/spi/src/main/net/dpml/system/SystemCriteria.java

development/laboratory/users/niclas/osgi/system/test/src/test/net/dpml/system/impl/test/SystemContextFactoryTestCase.java

development/laboratory/users/niclas/osgi/testing/cli/src/test/net/dpml/metro/test/MetroTestCase.java

development/laboratory/users/niclas/osgi/testing/components/src/main/net/dpml/test/components/AnotherTestComponent.java

development/laboratory/users/niclas/osgi/testing/components/src/main/net/dpml/test/components/AnotherTestService.java

development/laboratory/users/niclas/osgi/testing/components/src/main/net/dpml/test/components/TestComponent.java

development/laboratory/users/niclas/osgi/testing/components/src/main/net/dpml/test/components/TestService.java
development/laboratory/users/niclas/osgi/testing/includes/build.xml

development/laboratory/users/niclas/osgi/testing/includes/src/main/BLOCK-INF/block.xml

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/ComplexComponent.java

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/ComplexService.java

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/NullService.java

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/SimpleComponent.java

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/SimpleComponent.xconfig

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/SimpleService.java

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/TerminalComponent.java

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicComponent.java

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicComponent.xconfig

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicComponent.xprofile

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicContext.java

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicContextImp.java

development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicService.java

development/laboratory/users/niclas/osgi/testing/testa/src/main/net/dpml/test/testa/TestA.java

development/laboratory/users/niclas/osgi/testing/testc/src/main/net/dpml/test/testc/TestC.java

development/laboratory/users/niclas/osgi/testing/testcyclic/src/main/net/dpml/test/testcyclic/TestCyclicA.java

development/laboratory/users/niclas/osgi/testing/testcyclic/src/main/net/dpml/test/testcyclic/TestCyclicB.java

development/laboratory/users/niclas/osgi/testing/testd/src/main/net/dpml/test/testd/TestD.java

development/laboratory/users/niclas/osgi/testing/teste/src/main/net/dpml/test/teste/TestE.java

development/laboratory/users/niclas/osgi/unit/src/main/net/dpml/metro/unit/CompositionTestCase.java

development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/Defaults.java

development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/DefaultsBuilder.java

development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/DefaultsFinder.java

development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/SimpleDefaultsFinder.java

development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/SystemDefaultsFinder.java

development/laboratory/users/niclas/osgi/util/defaults/src/test/net/dpml/defaults/test/DefaultsBuilderTestCase.java
Log:
Cleaning up the stuff I don't think we need in the OSGi adopted Metro.

Modified:
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/Appliance.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/Appliance.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/Appliance.java
Sun Jun 12 09:47:29 2005
@@ -40,7 +40,7 @@
* management during the deployment and decommission cycles.
*
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Appliance extends Commissionable, Resolver

Modified:
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/ApplianceException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/ApplianceException.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/ApplianceException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a appliance related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ApplianceException

Modified:
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/ApplianceRuntimeException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/ApplianceRuntimeException.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/ApplianceRuntimeException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was an appliance related runtime error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ApplianceRuntimeException

Modified:
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/ComponentFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/ComponentFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/ComponentFactory.java
Sun Jun 12 09:47:29 2005
@@ -23,13 +23,13 @@
* typically encapsulate component constuction semantic, lifecycle processing
* and end-of-life processing.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ComponentFactory
{
/**
- * Creation of a new instance including all deployment stage handling.
+ * Creation of a new instance including all deployment handling.
* @return the new instance
*/
Object incarnate() throws Exception;

Modified:
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/LifecycleException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/LifecycleException.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/LifecycleException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a lifecycle related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class LifecycleException

Modified:
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/LifecycleRuntimeException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/LifecycleRuntimeException.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/LifecycleRuntimeException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a lifecycle runtime related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class LifecycleRuntimeException

Modified:
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/LifestyleException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/LifestyleException.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/LifestyleException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was an lifestyle related runtime error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class LifestyleException

Modified:
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/LifestyleRuntimeException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/LifestyleRuntimeException.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/LifestyleRuntimeException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was an lifestyle related runtime error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class LifestyleRuntimeException

Modified:
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/RuntimeFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/RuntimeFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/RuntimeFactory.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@
/**
* A factory enabling the establishment of runtime handlers.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface RuntimeFactory

Modified:
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/RuntimeFactoryException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/RuntimeFactoryException.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/RuntimeFactoryException.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
/**
* Exception to indicate that there was a error related to the runtime
factory.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class RuntimeFactoryException

Modified:
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/TransientApplianceException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/TransientApplianceException.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/api/src/main/net/dpml/activation/TransientApplianceException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a transient exception.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class TransientApplianceException extends ApplianceException

Modified: development/laboratory/users/niclas/osgi/activation/impl/build.xml
==============================================================================
--- development/laboratory/users/niclas/osgi/activation/impl/build.xml
(original)
+++ development/laboratory/users/niclas/osgi/activation/impl/build.xml Sun
Jun 12 09:47:29 2005
@@ -8,8 +8,6 @@
<target name="init" depends="standard.init">
<x:filter key="dpml-activation-metro-provider" feature="plugin"
token="METRO-RUNTIME-PROVIDER-SPEC"/>
- <x:filter key="dpml-activation-avalon-provider" feature="plugin"
- token="AVALON-RUNTIME-PROVIDER-SPEC"/>
</target>

<target name="package" depends="standard.package">

Modified:
development/laboratory/users/niclas/osgi/activation/impl/etc/test/logging.xml
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/impl/etc/test/logging.xml
(original)
+++
development/laboratory/users/niclas/osgi/activation/impl/etc/test/logging.xml
Sun Jun 12 09:47:29 2005
@@ -4,7 +4,7 @@

<factories>
<factory type="file"
- class="org.apache.avalon.logging.logkit.factory.FileTargetFactory"/>
+ class="net.dpml.logging.logkit.factory.FileTargetFactory"/>
</factories>

<targets>

Modified:
development/laboratory/users/niclas/osgi/activation/impl/etc/test/playground.xml
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/impl/etc/test/playground.xml
(original)
+++
development/laboratory/users/niclas/osgi/activation/impl/etc/test/playground.xml
Sun Jun 12 09:47:29 2005
@@ -14,18 +14,18 @@
</classloader>

<services>
- <service type="org.apache.avalon.test.playground.basic.BasicService"
version="1.1"/>
+ <service type="net.dpml.test.playground.basic.BasicService"
version="1.1"/>
</services>

<container name="subsidiary">

<component name="complex"
- class="org.apache.avalon.test.playground.ComplexComponent">
+ class="net.dpml.test.playground.ComplexComponent">
<categories priority="INFO"/>
</component>

<container name="test">
- <component name="simple"
class="org.apache.avalon.test.playground.SimpleComponent"/>
+ <component name="simple"
class="net.dpml.test.playground.SimpleComponent"/>
</container>

</container>
@@ -36,20 +36,20 @@
-->
<!--
<component name="demo"
- class="org.apache.avalon.test.playground.DemoManager"/>
+ class="net.dpml.test.playground.DemoManager"/>

<component name="exploitation"
- class="org.apache.avalon.test.playground.ExploitationManager"/>
+ class="net.dpml.test.playground.ExploitationManager"/>

<component name="basic"
- class="org.apache.avalon.test.playground.basic.BasicComponent"
+ class="net.dpml.test.playground.basic.BasicComponent"
activation="startup">
- <context
class="org.apache.avalon.test.playground.basic.BasicContextImp">
- <entry key="location">
+ <context class="net.dpml.test.playground.basic.BasicContextImp">
+ <entry key="location" class="java.lang.String" >
<constructor>My Place</constructor>
</entry>
- <entry key="home">
- <import key="urn:avalon:home"/>
+ <entry key="home" class="java.io.File" >
+ <import key="urn:metro:dir"/>
</entry>
</context>
</component>

Modified:
development/laboratory/users/niclas/osgi/activation/impl/etc/test/system/kernel.xml
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/impl/etc/test/system/kernel.xml
(original)
+++
development/laboratory/users/niclas/osgi/activation/impl/etc/test/system/kernel.xml
Sun Jun 12 09:47:29 2005
@@ -11,29 +11,4 @@

<logging path="system/logging.xml"/>

- <security>
- <profile name="default">
- <permissions>
- <permission class="java.util.PropertyPermission" name="java.*">
- <action>read</action>
- </permission>
- <permission class="java.util.PropertyPermission" name="os.*">
- <action>read</action>
- </permission>
- <permission class="java.util.PropertyPermission"
name="file.separator">
- <action>read</action>
- </permission>
- <permission class="java.util.PropertyPermission"
name="path.separator">
- <action>read</action>
- </permission>
- <permission class="java.util.PropertyPermission"
name="line.separator">
- <action>read</action>
- </permission>
- <permission class="java.util.PropertyPermission" name="user.name">
- <action>read</action>
- </permission>
- </permissions>
- </profile>
- </security>
-
</kernel>

Modified:
development/laboratory/users/niclas/osgi/activation/impl/etc/test/system/logging.xml
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/impl/etc/test/system/logging.xml
(original)
+++
development/laboratory/users/niclas/osgi/activation/impl/etc/test/system/logging.xml
Sun Jun 12 09:47:29 2005
@@ -9,7 +9,7 @@

<factories>
<factory type="file"
- class="org.apache.avalon.logging.logkit.factory.FileTargetFactory"/>
+ class="net.dpml.logging.logkit.factory.FileTargetFactory"/>
</factories>

<targets>

Modified:
development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/AbstractAppliance.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/AbstractAppliance.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/AbstractAppliance.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@

/**
* Abstract appliance.
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public abstract class AbstractAppliance implements Appliance

Modified:
development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/DefaultBlock.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/DefaultBlock.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/DefaultBlock.java
Sun Jun 12 09:47:29 2005
@@ -31,7 +31,7 @@

/**
* Composite appliance.
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultBlock extends AbstractAppliance

Modified:
development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/DefaultRuntime.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/DefaultRuntime.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/DefaultRuntime.java
Sun Jun 12 09:47:29 2005
@@ -41,7 +41,7 @@
/**
* Implementation of a system context that exposes a system wide set of
parameters.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultRuntime implements Runtime
@@ -53,9 +53,6 @@
private static final String METRO_RUNTIME =
"@METRO-RUNTIME-PROVIDER-SPEC@";

- private static final String AVALON_RUNTIME =
- "@AVALON-RUNTIME-PROVIDER-SPEC@";
-
//--------------------------------------------------------------
// immutable state
//--------------------------------------------------------------
@@ -68,7 +65,6 @@
//--------------------------------------------------------------

private RuntimeFactory m_metro;
- private RuntimeFactory m_avalon;

//--------------------------------------------------------------
// constructor
@@ -169,14 +165,7 @@
else
{
ComponentModel component = (ComponentModel) model;
- if( component.getType().getInfo().isNative() )
- {
- return getMetroRuntimeFactory();
- }
- else
- {
- return getAvalonRuntimeFactory();
- }
+ return getMetroRuntimeFactory();
}
}

@@ -205,41 +194,11 @@
}
}

- private RuntimeFactory getAvalonRuntimeFactory()
- {
- if( null != m_avalon )
- {
- return m_avalon ;
- }
- else
- {
- try
- {
- ClassLoader classloader = Appliance.class.getClassLoader();
- URI uri = getAvalonRuntimeArtifact();
- Object[] params = new Object[]{ m_system };
- m_avalon = (RuntimeFactory)
m_system.getRepository().getPlugin( classloader, uri, params );
- return m_avalon;
- }
- catch( Throwable e )
- {
- final String error =
- "Bugger, bugger, bugger";
- throw new LifestyleRuntimeException( error, e );
- }
- }
- }
-
private URI getMetroRuntimeArtifact() throws URISyntaxException
{
return Artifact.createArtifact( METRO_RUNTIME ).toURI();
}

- private URI getAvalonRuntimeArtifact() throws URISyntaxException
- {
- return Artifact.createArtifact( AVALON_RUNTIME ).toURI();
- }
-
private class BlockFactory implements RuntimeFactory
{
private final Map m_map = new Hashtable();

Modified:
development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/DefaultState.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/DefaultState.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/DefaultState.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* The State class desribes a enabled versus disabled state.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: DefaultState.java 187 2004-10-23 17:10:53Z niclas $
*/


Modified:
development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/Resources.properties
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/Resources.properties
(original)
+++
development/laboratory/users/niclas/osgi/activation/impl/src/main/net/dpml/activation/impl/Resources.properties
Sun Jun 12 09:47:29 2005
@@ -13,11 +13,9 @@
lifestyle.error.no-constructor=Supplied component class {0} does not declare
a public constructor.
lifecycle.error.unrecognized-parameter=The constructor argument [{0}] in
component class {1} is not recognized.
lifecycle.error.instantiation=Component related exception during
instantiation of the class [{0}].
-lifecycle.error.invalid-stage-provider=Assigned stage provider [{0}] is not
a component model.
-lifecycle.error.stage.creator=Creation stage handler error raised by
extension id: [{0}].
lifestyle.error.new=Unable to create a new component instance in appliance
[{0}] due to a component deployment failure.
lifestyle.error.contextualization=Internal error while attempting to resolve
contexualization handler from the appliance [{0}].
-lifecycle.error.avalon-contextualization=Contextualization failure in [{0}].
+lifecycle.error.metro-contextualization=Contextualization failure in [{0}].
lifecycle.error.custom-contextualization=Contextualization failure in [{0}]
using custom handler [{1}].

#

Modified:
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/AbstractAppliance.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/AbstractAppliance.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/AbstractAppliance.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@

/**
* Abstract appliance.
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public abstract class AbstractAppliance implements Appliance

Modified:
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/AbstractLifestyleManager.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/AbstractLifestyleManager.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/AbstractLifestyleManager.java
Sun Jun 12 09:47:29 2005
@@ -32,7 +32,7 @@
/**
* Abstract implentation class for a lifestyle handler.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public abstract class AbstractLifestyleManager implements LifestyleManager

Modified:
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/ApplianceInvocationHandler.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/ApplianceInvocationHandler.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/ApplianceInvocationHandler.java
Sun Jun 12 09:47:29 2005
@@ -23,10 +23,6 @@
import java.lang.reflect.UndeclaredThrowableException;
import java.lang.reflect.Method;

-import java.security.PrivilegedActionException;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
-
import net.dpml.activation.ApplianceException;
import net.dpml.activation.TransientApplianceException;

@@ -42,7 +38,7 @@
* This makes a dynamic proxy for an object. The object can be represented
* by one, some or all of it's interfaces.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ApplianceInvocationHandler
@@ -55,7 +51,6 @@
private final DefaultAppliance m_appliance;
private final Logger m_logger;
private final ComponentModel m_model;
- private final boolean m_secure;

//-------------------------------------------------------------------
// immutable state
@@ -74,8 +69,7 @@
* @param appliance the runtime appliance
* @param logger the assigned logging channel
*/
- ApplianceInvocationHandler(
- DefaultAppliance appliance, Logger logger, boolean secure )
+ ApplianceInvocationHandler( DefaultAppliance appliance, Logger logger )
throws NullArgumentException
{
assertNotNull( appliance, "appliance" );
@@ -83,7 +77,6 @@

m_appliance = appliance;
m_logger = logger;
- m_secure = secure;
m_model = m_appliance.getComponentModel();
}

@@ -116,25 +109,7 @@
try
{
final Object instance = getInstance();
-
- if( m_secure )
- {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction()
- {
- public Object run() throws Exception
- {
- return method.invoke( instance, args );
- }
- },
- m_model.getAccessControlContext()
- );
- }
- else
- {
- return method.invoke( instance, args );
- }
+ return method.invoke( instance, args );
}
catch( Throwable e )
{
@@ -220,14 +195,6 @@
return new ApplianceException( error, e );
e = cause;
}
- else if( e instanceof PrivilegedActionException )
- {
- Throwable cause =
- ((PrivilegedActionException) e).getException();
- if( cause == null )
- return new ApplianceException( error, e );
- e = cause;
- }
else
{
break;

Modified:
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/ContainerUtil.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/ContainerUtil.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/ContainerUtil.java
Sun Jun 12 09:47:29 2005
@@ -38,9 +38,9 @@

/**
* Utility class that makes it easier to transfer
- * a component throught it's lifecycle stages.
+ * a component through its lifecycle.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ContainerUtil
@@ -53,7 +53,7 @@
}

/**
- * Run specified object through shutdown lifecycle stages
+ * Run specified object through shutdown lifecycle.
* (Stop and Dispose).
*
* @param object the object to shutdown
@@ -75,8 +75,7 @@
* in which case the specified object must not implement
LogEnabled.
* @throws IllegalArgumentException if the object is LogEnabled but
Logger is null
*/
- public static void enableLogging( final Object object,
- final Logger logger )
+ public static void enableLogging( final Object object, final Logger
logger )
{
if( object instanceof LogEnabled )
{

Modified:
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultAppliance.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultAppliance.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultAppliance.java
Sun Jun 12 09:47:29 2005
@@ -34,7 +34,7 @@

/**
* Abstract appliance.
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultAppliance extends AbstractAppliance
@@ -59,19 +59,15 @@

private long m_delay = 0;

- private final boolean m_secure;
-
//-------------------------------------------------------------------
// constructor
//-------------------------------------------------------------------

- public DefaultAppliance(
- ComponentModel model, LifestyleManager lifestyle )
+ public DefaultAppliance( ComponentModel model, LifestyleManager
lifestyle )
{
super( model );
m_model = model;
m_lifestyle = lifestyle;
- m_secure = model.isCodeSecurityEnabled();
}

//-------------------------------------------------------------------
@@ -130,24 +126,7 @@
*/
public Object resolve() throws Exception
{
- //
- // handle the legacy 3.3.0 usage of the "urn:activation:proxy" key
- // if after handle the 3.4.0 semantics for resolution against the
model
- //
-
- if( getComponentModel().getType().getInfo().
- getAttribute( "urn:activation:proxy", "true" ).equals( "false"
) )
- {
- final String message =
- "Component type references the deprecated
'urn:activation:proxy' key."
- + " Please update to the key '" + ComponentModel.PROXY_KEY +
"'.";
- getLogger().warn( message );
- return resolve( false );
- }
- else
- {
- return resolve( getComponentModel().getProxyPolicy() );
- }
+ return resolve( getComponentModel().getProxyPolicy() );
}

public Object resolve( boolean proxy ) throws Exception
@@ -180,8 +159,7 @@
{
ComponentModel model = getComponentModel();
Logger logger = model.getLogger().getChildLogger( "proxy" );
- ApplianceInvocationHandler handler =
- new ApplianceInvocationHandler( this, logger, m_secure );
+ ApplianceInvocationHandler handler = new
ApplianceInvocationHandler( this, logger );

try
{

Modified:
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultComponentFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultComponentFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultComponentFactory.java
Sun Jun 12 09:47:29 2005
@@ -19,9 +19,6 @@
package net.dpml.activation.metro;

import java.lang.reflect.Constructor;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
import java.util.Map;

import net.dpml.activation.ComponentFactory;
@@ -32,18 +29,10 @@
import net.dpml.activity.Initializable;
import net.dpml.activity.Startable;

-import net.dpml.composition.info.DeliveryDescriptor;
-import net.dpml.composition.info.NativeDeliveryDescriptor;
-import net.dpml.composition.info.StagedDeliveryDescriptor;
-
import net.dpml.composition.model.ComponentModel;
import net.dpml.composition.model.ContextModel;
-import net.dpml.composition.model.ContextualizationHandler;
import net.dpml.composition.model.DeploymentModel;
-import net.dpml.composition.model.LifecycleCreateExtension;
-import net.dpml.composition.model.LifecycleDestroyExtension;
import net.dpml.composition.model.ModelException;
-import net.dpml.composition.model.StageModel;

import net.dpml.configuration.Configurable;
import net.dpml.configuration.Configuration;
@@ -61,8 +50,6 @@
import net.dpml.logging.LogEnabled;
import net.dpml.logging.Logger;

-import net.dpml.meta.info.StageDescriptor;
-
import net.dpml.parameters.Parameterizable;
import net.dpml.parameters.Parameters;

@@ -74,7 +61,7 @@
/**
* A factory enabling the establishment of component instances.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultComponentFactory
@@ -96,8 +83,6 @@

private final Logger m_logger;

- private final boolean m_secure;
-
//-------------------------------------------------------------------
// constructor
//-------------------------------------------------------------------
@@ -109,8 +94,6 @@
public DefaultComponentFactory( ComponentModel model )
{
m_model = model;
-
- m_secure = model.isCodeSecurityEnabled();
m_logger = model.getLogger().getChildLogger( "lifecycle" );
}

@@ -132,8 +115,7 @@
}

ClassLoader current = Thread.currentThread().getContextClassLoader();
- ClassLoader classloader =
- m_model.getDeploymentClass().getClassLoader();
+ ClassLoader classloader =
m_model.getDeploymentClass().getClassLoader();
Thread.currentThread().setContextClassLoader( classloader );

try
@@ -141,8 +123,7 @@
Object instance = incarnation();
if( getLogger().isDebugEnabled() )
{
- final String message =
- "incarnation complete";
+ final String message = "incarnation complete";
getLogger().debug( message );
}
return instance;
@@ -159,89 +140,33 @@
*/
public void etherialize( final Object instance )
{
- if( getLogger().isDebugEnabled() )
+ getLogger().debug( "etherialization" );
+
+ if( instance instanceof Startable )
{
- final String message =
- "etherialization";
- getLogger().debug( message );
+ getLogger().debug( "applying shutdown" );
+ try
+ {
+ ContainerUtil.stop( instance );
+ }
+ catch( Throwable e )
+ {
+ final String warning = "Ignoring component source shutdown
error.";
+ getLogger().warn( warning, e );
+ }
}

- try
- {
- applyCreateStage( instance, false );
- }
- catch( Throwable e )
- {
- // will not happen
- }
- finally
+ if( instance instanceof Disposable )
{
- if( instance instanceof Startable )
+ getLogger().debug( "applying disposal" );
+ try
{
- getLogger().debug( "applying shutdown" );
- try
- {
- if( m_secure )
- {
- AccessController.doPrivileged(
- new PrivilegedExceptionAction()
- {
- public Object run() throws Exception
- {
- ((Startable)instance).stop();
- return null;
- }
- },
- m_model.getAccessControlContext() );
- }
- else
- {
- ContainerUtil.stop( instance );
- }
- }
- catch( Throwable e )
- {
- if( getLogger().isWarnEnabled() )
- {
- final String warning =
- "Ignoring component source shutdown error.";
- getLogger().warn( warning, e );
- }
- }
+ ContainerUtil.dispose( instance );
}
-
- if( instance instanceof Disposable )
+ catch( Throwable e )
{
- getLogger().debug( "applying disposal" );
- try
- {
- if( m_secure )
- {
- AccessController.doPrivileged(
- new PrivilegedExceptionAction()
- {
- public Object run() throws Exception
- {
- ((Disposable)instance).dispose();
- return null;
- }
- },
- m_model.getAccessControlContext() );
- }
- else
- {
- ContainerUtil.dispose( instance );
- }
- }
- catch( Throwable e )
- {
- if( getLogger().isWarnEnabled() )
- {
- final String warning =
- "Ignoring component source disposal error.";
- getLogger().warn( warning, e );
- }
- }
+ final String warning = "Ignoring component source disposal
error.";
+ getLogger().warn( warning, e );
}
}
}
@@ -282,187 +207,53 @@
if( instance instanceof LogEnabled )
{
getLogger().debug( "applying logger" );
- if( m_secure )
- {
- AccessController.doPrivileged(
- new PrivilegedAction()
- {
- public Object run()
- {
- ((LogEnabled)instance).enableLogging( logger );
- return null;
- }
- },
- m_model.getAccessControlContext() );
- }
- else
- {
- ContainerUtil.enableLogging( instance, logger );
- }
+ ContainerUtil.enableLogging( instance, logger );
}

if( instance instanceof Contextualizable )
{
getLogger().debug( "applying context" );
- if( m_secure )
- {
- AccessController.doPrivileged(
- new PrivilegedExceptionAction()
- {
- public Object run() throws Exception
- {
- ((Contextualizable)instance).contextualize(
(Context) context );
- return null;
- }
- },
- m_model.getAccessControlContext() );
- }
- else
- {
- ContainerUtil.contextualize( instance, (Context) context
);
- }
+ ContainerUtil.contextualize( instance, (Context) context );
}

if( instance instanceof Serviceable )
{
getLogger().debug( "applying service manager" );
- if( m_secure )
- {
- AccessController.doPrivileged(
- new PrivilegedExceptionAction()
- {
- public Object run() throws Exception
- {
- ((Serviceable)instance).service( manager );
- return null;
- }
- },
- m_model.getAccessControlContext() );
- }
- else
- {
- ContainerUtil.service( instance, manager );
- }
+ ContainerUtil.service( instance, manager );
}

if( instance instanceof Configurable )
{
getLogger().debug( "applying configuration" );
- if( m_secure )
- {
- AccessController.doPrivileged(
- new PrivilegedExceptionAction()
- {
- public Object run() throws Exception
- {
- ((Configurable)instance).configure( config );
- return null;
- }
- },
- m_model.getAccessControlContext() );
- }
- else
- {
- ContainerUtil.configure( instance, config );
- }
+ ContainerUtil.configure( instance, config );
}

if( instance instanceof Parameterizable )
{
getLogger().debug( "applying parameters" );
- if( m_secure )
- {
- AccessController.doPrivileged(
- new PrivilegedExceptionAction()
- {
- public Object run() throws Exception
- {
- ((Parameterizable)instance).parameterize(
params );
- return null;
- }
- },
- m_model.getAccessControlContext() );
- }
- else
- {
- ContainerUtil.parameterize( instance, params );
- }
+ ContainerUtil.parameterize( instance, params );
}

//
- // handle lifecycle extensions
- //
-
- applyCreateStage( instance, true );
-
- //
// complete intialization
//

if( instance instanceof Initializable )
{
getLogger().debug( "applying initialization" );
- if( m_secure )
- {
- AccessController.doPrivileged(
- new PrivilegedExceptionAction()
- {
- public Object run() throws Exception
- {
- ((Initializable)instance).initialize();
- return null;
- }
- },
- m_model.getAccessControlContext() );
- }
- else
- {
- ContainerUtil.initialize( instance );
- }
+ ContainerUtil.initialize( instance );
}

if( Startable.class.isAssignableFrom( clazz ) )
{
getLogger().debug( "applying startup" );
- if( m_secure )
- {
- AccessController.doPrivileged(
- new PrivilegedExceptionAction()
- {
- public Object run() throws Exception
- {
- ((Startable)instance).start();
- return null;
- }
- },
- m_model.getAccessControlContext() );
- }
- else
- {
- ContainerUtil.start( instance );
- }
+ ContainerUtil.start( instance );
getLogger().debug( "component startup completed" );
}
else if( Executable.class.isAssignableFrom( clazz ) )
{
getLogger().debug( "applying execution" );
- if( m_secure )
- {
- AccessController.doPrivileged(
- new PrivilegedExceptionAction()
- {
- public Object run() throws Exception
- {
- ((Executable)instance).execute();
- return null;
- }
- },
- m_model.getAccessControlContext() );
- }
- else
- {
- ContainerUtil.execute( instance );
- }
+ ContainerUtil.execute( instance );
getLogger().debug( "component execution completed" );
}
}
@@ -702,22 +493,7 @@
+ n + " arguments." );
}

- if( m_secure )
- {
- return AccessController.doPrivileged(
- new PrivilegedExceptionAction()
- {
- public Object run() throws Exception
- {
- return constructor.newInstance( args );
- }
- },
- m_model.getAccessControlContext() );
- }
- else
- {
- return constructor.newInstance( args );
- }
+ return constructor.newInstance( args );
}
catch( Throwable e )
{
@@ -730,211 +506,32 @@
}
}

- private void applyCreateStage( Object instance, boolean flag )
- throws LifecycleException
- {
- StageDescriptor[] stages = m_model.getType().getStages();
- if( ( stages.length > 0 ) && getLogger().isDebugEnabled() )
- {
- getLogger().debug( "stage count: " + stages.length );
- }
-
- for( int i=0; i<stages.length; i++ )
- {
- StageDescriptor stage = stages[i];
- ComponentModel provider = getStageProvider( stage );
- Class c = provider.getDeploymentClass();
-
- if( flag && LifecycleCreateExtension.class.isAssignableFrom( c )
)
- {
- LifecycleCreateExtension handler =
- getLifecycleCreateExtension( provider );
-
- try
- {
- if( getLogger().isDebugEnabled() )
- {
- int id = System.identityHashCode( instance );
- getLogger().debug( "applying model create stage to:
" + id );
- }
- handler.create( m_model, stage, instance );
- }
- catch( Throwable e )
- {
- final String error =
- "Create stage extension error.";
- throw new LifecycleException( error, e );
- }
- finally
- {
- provider.release( handler );
- }
- }
- else if( !flag &&
LifecycleDestroyExtension.class.isAssignableFrom( c ) )
- {
- LifecycleDestroyExtension handler =
- getLifecycleDestroyExtension( provider );
-
- try
- {
- if( getLogger().isDebugEnabled() )
- {
- int id = System.identityHashCode( instance );
- getLogger().debug( "applying model destroy stage to:
" + id );
- }
- handler.destroy( m_model, stage, instance );
- }
- catch( Throwable e )
- {
- if( getLogger().isWarnEnabled() )
- {
- final String error =
- "Ignoring destroy stage error";
- getLogger().warn( error, e );
- }
- }
- finally
- {
- provider.release( handler );
- }
- }
- }
- }
-
- private LifecycleCreateExtension getLifecycleCreateExtension(
- DeploymentModel provider ) throws LifecycleException
- {
- try
- {
- return (LifecycleCreateExtension) provider.resolve();
- }
- catch( Throwable e )
- {
- final String error =
- "Unable to resolve lifecycle creation extension provider.";
- throw new LifecycleException( error, e );
- }
- }
-
- private LifecycleDestroyExtension getLifecycleDestroyExtension(
- DeploymentModel provider ) throws LifecycleException
- {
- try
- {
- return (LifecycleDestroyExtension) provider.resolve();
- }
- catch( Throwable e )
- {
- final String error =
- "Unable to resolve lifecycle destroy extension provider.";
- throw new LifecycleException( error, e );
- }
- }
-
- private ComponentModel getStageProvider( StageDescriptor stage )
- throws IllegalStateException
- {
- final String key = stage.getKey();
- StageModel model = m_model.getStageModel( stage );
- DeploymentModel provider = model.getProvider();
- if( provider instanceof ComponentModel )
- {
- return (ComponentModel) provider;
- }
- else
- {
- final String error =
- REZ.getString(
- "lifecycle.error.invalid-stage-provider",
- key );
- throw new IllegalStateException( error );
- }
- }
-
- private void applyContext(
- final Object instance, DeliveryDescriptor delivery, final Object
context )
- throws LifecycleException
+ private void applyContext( final Object instance, final Object context )
+ throws LifecycleException
{
if( null == context ) return;

final ContextModel model = m_model.getContextModel();
-
- if( delivery instanceof NativeDeliveryDescriptor )
- {
- getLogger().debug( "applying context" );
-
- //
- // its classic avalon
- //
-
- if( context instanceof Context )
- {
- try
- {
- if( m_secure )
- {
- AccessController.doPrivileged(
- new PrivilegedExceptionAction()
- {
- public Object run() throws Exception
- {
- ((Contextualizable)instance).contextualize(
- (Context) context );
- return null;
- }
- },
- m_model.getAccessControlContext() );
- }
- else
- {
- ContainerUtil.contextualize( instance, (Context)
context );
- }
- }
- catch( Throwable e )
- {
- final String error =
- REZ.getString(
- "lifecycle.error.avalon-contextualization",
- m_model.getQualifiedName() );
- throw new LifecycleException( error, e );
- }
- }
- else
- {
- final String error =
- "Supplied context class ["
- + context.getClass().getName()
- + "] does not implement the Avalon Context interface.";
- throw new LifecycleException( error );
- }
- }
- else if( delivery instanceof StagedDeliveryDescriptor )
+ getLogger().debug( "applying context" );
+ if( context instanceof Context )
{
- getLogger().warn( "applying custom context: " +
delivery.getClass().getName() );
- final DeploymentModel provider = model.getProvider();
try
{
- ContextualizationHandler handler =
- (ContextualizationHandler) provider.resolve();
- handler.contextualize( instance, (Context) context );
+ ContainerUtil.contextualize( instance, (Context) context );
}
catch( Throwable e )
{
- final String error =
- REZ.getString(
- "lifecycle.error.custom-contextualization",
- m_model.getQualifiedName(),
- provider.toString() );
+ final String error = REZ.getString(
"lifecycle.error.metro-contextualization", m_model.getQualifiedName() );
throw new LifecycleException( error, e );
}
}
else
{
final String error =
- "Unrecognized delivery strategy: ["
- + delivery.getClass().getName()
- + "].";
- throw new IllegalStateException( error );
+ "Supplied context class ["
+ + context.getClass().getName()
+ + "] does not implement the Context interface.";
+ throw new LifecycleException( error );
}
}
}

Modified:
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultLifestyleFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultLifestyleFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultLifestyleFactory.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,7 @@
/**
* A factory enabling the establishment of runtime handlers.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultLifestyleFactory implements LifestyleFactory

Modified:
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultRuntimeFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultRuntimeFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultRuntimeFactory.java
Sun Jun 12 09:47:29 2005
@@ -35,7 +35,7 @@
/**
* A factory enabling the establishment of runtime handlers.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultRuntimeFactory implements RuntimeFactory

Modified:
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultServiceManager.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultServiceManager.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultServiceManager.java
Sun Jun 12 09:47:29 2005
@@ -40,7 +40,7 @@

/**
* Default implementation of the framework {@link ServiceManager} interface.
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
class DefaultServiceManager implements ServiceManager
{

Modified:
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/Resources.properties
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/Resources.properties
(original)
+++
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/Resources.properties
Sun Jun 12 09:47:29 2005
@@ -13,11 +13,9 @@
lifestyle.error.no-constructor=Supplied component class {0} does not declare
a public constructor.
lifecycle.error.unrecognized-parameter=The constructor argument [{0}] in
component class {1} is not recognized.
lifecycle.error.instantiation=Component related exception during
instantiation of the class [{0}].
-lifecycle.error.invalid-stage-provider=Assigned stage provider [{0}] is not
a component model.
-lifecycle.error.stage.creator=Creation stage handler error raised by
extension id: [{0}].
lifestyle.error.new=Unable to create a new component instance in appliance
[{0}] due to a component deployment failure.
lifestyle.error.contextualization=Internal error while attempting to resolve
contexualization handler from the appliance [{0}].
-lifecycle.error.avalon-contextualization=Contextualization failure in [{0}].
+lifecycle.error.metro-contextualization=Contextualization failure in [{0}].
lifecycle.error.custom-contextualization=Contextualization failure in [{0}]
using custom handler [{1}].

#

Modified:
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/SingletonLifestyleManager.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/SingletonLifestyleManager.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/SingletonLifestyleManager.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
import net.dpml.composition.model.ComponentModel;

/**
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class SingletonLifestyleManager extends AbstractLifestyleManager

Modified:
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/ThreadLifestyleManager.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/ThreadLifestyleManager.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/ThreadLifestyleManager.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
import net.dpml.composition.model.ComponentModel;

/**
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ThreadLifestyleManager extends AbstractLifestyleManager

Modified:
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/TransientLifestyleManager.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/TransientLifestyleManager.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/providers/metro/src/main/net/dpml/activation/metro/TransientLifestyleManager.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,7 @@
import net.dpml.meta.info.InfoDescriptor;

/**
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class TransientLifestyleManager extends AbstractLifestyleManager

Modified: development/laboratory/users/niclas/osgi/activation/test/build.xml
==============================================================================
--- development/laboratory/users/niclas/osgi/activation/test/build.xml
(original)
+++ development/laboratory/users/niclas/osgi/activation/test/build.xml Sun
Jun 12 09:47:29 2005
@@ -12,10 +12,6 @@
token="TEST-PLAYGROUND-SPEC"/>
<x:filter key="dpml-test-components" feature="uri"
token="TEST-COMPONENTS-SPEC"/>
- <x:filter key="avalon-framework-api" feature="uri"
- token="AVALON-API-SPEC"/>
- <x:filter key="avalon-framework-impl" feature="uri"
- token="AVALON-IMPL-SPEC"/>
<x:filter key="dpml-logging-api" feature="uri"
token="LOGGING-API-SPEC"/>
<x:filter key="dpml-context-api" feature="uri"

Modified:
development/laboratory/users/niclas/osgi/activation/test/etc/test/kernel.xml
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/test/etc/test/kernel.xml
(original)
+++
development/laboratory/users/niclas/osgi/activation/test/etc/test/kernel.xml
Sun Jun 12 09:47:29 2005
@@ -5,31 +5,6 @@

<kernel>

- <security>
- <profile name="default">
- <permissions>
- <permission class="java.util.PropertyPermission" name="java.*">
- <action>read</action>
- </permission>
- <permission class="java.util.PropertyPermission" name="os.*">
- <action>read</action>
- </permission>
- <permission class="java.util.PropertyPermission"
name="file.separator">
- <action>read</action>
- </permission>
- <permission class="java.util.PropertyPermission"
name="path.separator">
- <action>read</action>
- </permission>
- <permission class="java.util.PropertyPermission"
name="line.separator">
- <action>read</action>
- </permission>
- <permission class="java.util.PropertyPermission" name="user.name">
- <action>read</action>
- </permission>
- </permissions>
- </profile>
- </security>
-
<!--
Example block deployment descriptor.
-->
@@ -43,16 +18,6 @@
<artifact>@SERVICE-API-SPEC@</artifact>
<artifact>@TEST-COMPONENTS-SPEC@</artifact>
</classpath>
- <grant>
- <permission class="java.util.PropertyPermission" name="java.*" >
- <action>read</action>
- </permission>
- <permission class="java.util.PropertyPermission" name="org.apache.*" >
- <action>read</action>
- <action>write</action>
- </permission>
- <permission class="java.lang.RuntimePermission" name="getClassLoader"
/>
- </grant>
</classloader>

<container name="Component1" >
@@ -72,4 +37,4 @@
</container>


-</kernel>
\ No newline at end of file
+</kernel>

Modified:
development/laboratory/users/niclas/osgi/activation/test/etc/test/logging.xml
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/test/etc/test/logging.xml
(original)
+++
development/laboratory/users/niclas/osgi/activation/test/etc/test/logging.xml
Sun Jun 12 09:47:29 2005
@@ -9,7 +9,7 @@

<factories>
<factory type="file"
- class="org.apache.avalon.logging.logkit.factory.FileTargetFactory"/>
+ class="net.dpml.logging.logkit.factory.FileTargetFactory"/>
</factories>

<targets>

Modified:
development/laboratory/users/niclas/osgi/activation/test/src/test/net/dpml/activation/impl/test/PlaygroundTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activation/test/src/test/net/dpml/activation/impl/test/PlaygroundTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/activation/test/src/test/net/dpml/activation/impl/test/PlaygroundTestCase.java
Sun Jun 12 09:47:29 2005
@@ -27,7 +27,7 @@

/**
* CompositionFactoryTestCase
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class PlaygroundTestCase extends CompositionTestCase

Modified:
development/laboratory/users/niclas/osgi/activity/api/src/main/net/dpml/activity/Disposable.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activity/api/src/main/net/dpml/activity/Disposable.java
(original)
+++
development/laboratory/users/niclas/osgi/activity/api/src/main/net/dpml/activity/Disposable.java
Sun Jun 12 09:47:29 2005
@@ -20,7 +20,7 @@
* The Disposable interface is used when components need to
* deallocate and dispose resources prior to their destruction.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Disposable

Modified:
development/laboratory/users/niclas/osgi/activity/api/src/main/net/dpml/activity/Executable.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activity/api/src/main/net/dpml/activity/Executable.java
(original)
+++
development/laboratory/users/niclas/osgi/activity/api/src/main/net/dpml/activity/Executable.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
* <p>The work done may be short lived (ie a simple task) or it could
* be a long running.</p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Executable

Modified:
development/laboratory/users/niclas/osgi/activity/api/src/main/net/dpml/activity/Initializable.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activity/api/src/main/net/dpml/activity/Initializable.java
(original)
+++
development/laboratory/users/niclas/osgi/activity/api/src/main/net/dpml/activity/Initializable.java
Sun Jun 12 09:47:29 2005
@@ -20,7 +20,7 @@
* The Initializable interface is used by components that need to
* allocate resources prior to them becoming active.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Initializable

Modified:
development/laboratory/users/niclas/osgi/activity/api/src/main/net/dpml/activity/Startable.java
==============================================================================
---
development/laboratory/users/niclas/osgi/activity/api/src/main/net/dpml/activity/Startable.java
(original)
+++
development/laboratory/users/niclas/osgi/activity/api/src/main/net/dpml/activity/Startable.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
* Note that these methods should start the component but return
* imediately.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Startable

Modified: development/laboratory/users/niclas/osgi/build.xml
==============================================================================
--- development/laboratory/users/niclas/osgi/build.xml (original)
+++ development/laboratory/users/niclas/osgi/build.xml Sun Jun 12 09:47:29
2005
@@ -21,6 +21,7 @@
<project name="dpml-runtime" default="default" basedir="."
xmlns:transit="antlib:net.dpml.transit">

+ <property file="hacked.properties" />
<transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/BlockCompositionDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/BlockCompositionDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/BlockCompositionDirective.java
Sun Jun 12 09:47:29 2005
@@ -27,7 +27,7 @@
* a local resource to be included by reference into
* a container.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class BlockCompositionDirective extends DeploymentProfile

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/BlockIncludeDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/BlockIncludeDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/BlockIncludeDirective.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@
/**
* A block include directive that references a source file describing a
block.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class BlockIncludeDirective extends DeploymentProfile

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ClassLoaderDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ClassLoaderDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ClassLoaderDirective.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@
/**
* Description of classloader.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ClassLoaderDirective implements Serializable

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ClasspathDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ClasspathDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ClasspathDirective.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
/**
* Description of classpath.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ClasspathDirective implements Serializable

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ComponentProfile.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ComponentProfile.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ComponentProfile.java
Sun Jun 12 09:47:29 2005
@@ -50,7 +50,7 @@
may be serviced by components declared in parent container.
--&gt;</i></font>

-&lt;component name="<font color="darkred">complex</font>" class="<font
color="darkred">org.apache.avalon.playground.ComplexComponent</font>"
activation="<font color="darkred">startup</font>"&gt;
+&lt;component name="<font color="darkred">complex</font>" class="<font
color="darkred">net.dpml.playground.ComplexComponent</font>"
activation="<font color="darkred">startup</font>"&gt;

<font color="gray"><i>&lt;!--
Priority and target assignments for component specific logging categrories.
@@ -68,13 +68,13 @@
container. The following two context directives for "location" and "home"
demonstrate
programatics creation of context values. The first entry declares that
the context
value to be assigned to the key "location" shall be the String value
"Paris". The second
- context enty assignes the container's context value for "urn:avalon:home"
to the component's
+ context enty assignes the container's context value for "urn:metro:dir" to
the component's
context key of "home".
--&gt;</i></font>

&lt;context&gt;
&lt;entry key="<font color="darkred">location</font>"&gt;<font
color="darkred">Paris</font>&lt;/entry&gt;
- &lt;include name="<font color="darkred">urn:avalon:home</font>"
key="<font color="darkred">home</font>"/&gt;
+ &lt;include name="<font color="darkred">urn:metro:dir</font>" key="<font
color="darkred">home</font>"/&gt;
&lt;/context&gt;

<font color="gray"><i>&lt;!--
@@ -99,7 +99,7 @@
</pre>
*
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ComponentProfile extends DeploymentProfile
@@ -139,11 +139,6 @@
*/
private DependencyDirective[] m_dependencies;

- /**
- * The stage directives.
- */
- private StageDirective[] m_stages;
-

//--------------------------------------------------------------------------
// constructor

//--------------------------------------------------------------------------
@@ -159,8 +154,16 @@
throws NullArgumentException
{
this(
- name, DeploymentProfile.DEFAULT, InfoDescriptor.UNDEFINED,
classname, null, null, null, null,
- null, null, Mode.IMPLICIT );
+ name,
+ DeploymentProfile.DEFAULT,
+ InfoDescriptor.UNDEFINED,
+ classname,
+ null,
+ null,
+ null,
+ null,
+ null,
+ Mode.IMPLICIT );
}

/**
@@ -179,7 +182,6 @@
template.m_categories,
template.m_context,
template.m_dependencies,
- template.m_stages,
template.m_parameters,
template.m_configuration,
Mode.EXPLICIT );
@@ -193,7 +195,6 @@
final CategoriesDirective categories,
final ContextDirective context,
final DependencyDirective[] dependencies,
- final StageDirective[] stages,
final Parameters parameters,
final Configuration config,
final Mode mode )
@@ -221,15 +222,6 @@
{
m_dependencies = dependencies;
}
-
- if( null == stages )
- {
- m_stages = new StageDirective[0];
- }
- else
- {
- m_stages = stages;
- }
}


//--------------------------------------------------------------------------
@@ -298,36 +290,6 @@
}

/**
- * Return the stage directives.
- *
- * @return the set of StageDirective statements for the profile.
- */
- public StageDirective[] getStageDirectives()
- {
- return m_stages;
- }
-
- /**
- * Return the dependency directive for a supplied key.
- *
- * @return the matching DependencyDirective (possibly null if
- * no directive is declared for the given key)
- */
- public StageDirective getStageDirective( final String key )
- {
- StageDirective[] directives = getStageDirectives();
- for( int i=0; i<directives.length; i++ )
- {
- StageDirective directive = directives[i];
- if( directive.getKey().equals( key ) )
- {
- return directive;
- }
- }
- return null;
- }
-
- /**
* Return the Parameters for the profile.
*
* @return the Parameters for Component (if any).

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ConstructorDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ConstructorDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ConstructorDirective.java
Sun Jun 12 09:47:29 2005
@@ -32,7 +32,7 @@
*
* &lt!-- option (a) nested import -->
* &lt;entry key="<font color="darkred">my-home-dir</font>"&gt;
- * &lt;include key="<font color="darkred">urn:avalon:home</font>"/&gt;
+ * &lt;include key="<font color="darkred">urn:metro:dir</font>"/&gt;
* &lt;/entry&gt;
*
* &lt!-- option (b) param constructors -->
@@ -49,7 +49,7 @@
* @see ImportDirective
* @see Parameter
* @see ContextDirective
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ConstructorDirective extends EntryDirective

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ContainmentProfile.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ContainmentProfile.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ContainmentProfile.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@
* a classloader and the set of profiles explicitly included within
* the a container.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ContainmentProfile extends DeploymentProfile

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ContextDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ContextDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ContextDirective.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,7 @@
* <pre>
* &lt;context class="<font color="darkred">MyContextClass</font>"&gt;
* &lt;entry key="<font color="darkred">special</font>"&gt;
- * &lt;import key="<font
color="darkred">urn:avalon:classloader</font>"/&gt;
+ * &lt;import key="<font
color="darkred">urn:metro:classloader</font>"/&gt;
* &lt;/entry&gt;
* &lt;entry key="<font color="darkred">xxx</font>"&gt;
* &lt;param class="<font color="darkred">MySpecialClass</font>"&gt;
@@ -42,7 +42,7 @@
* </pre>
*
* @see EntryDirective
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ContextDirective implements Serializable

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/DependencyDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/DependencyDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/DependencyDirective.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
* A DependencyDirective contains information describing how a
* dependency should be resolved.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class DependencyDirective implements Serializable

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/DeploymentProfile.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/DeploymentProfile.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/DeploymentProfile.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
/**
* Abstract base class for ComponentProfile and ContainmentProfile.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public abstract class DeploymentProfile implements Serializable, Comparable

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/EntryDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/EntryDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/EntryDirective.java
Sun Jun 12 09:47:29 2005
@@ -35,7 +35,7 @@
*
* &lt!-- option (a) nested import -->
* &lt;entry key="<font color="darkred">my-home-dir</font>"&gt;
- * &lt;include key="<font color="darkred">urn:avalon:home</font>"/&gt;
+ * &lt;include key="<font color="darkred">urn:metro:dir</font>"/&gt;
* &lt;/entry&gt;
*
* &lt!-- option (b) param constructors -->
@@ -52,7 +52,7 @@
* @see ImportDirective
* @see Parameter
* @see ContextDirective
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public abstract class EntryDirective implements Serializable

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ExcludeDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ExcludeDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ExcludeDirective.java
Sun Jun 12 09:47:29 2005
@@ -30,11 +30,11 @@
* context.</p>
* <pre>
* <font color="gray">&lt;fileset dir="lib"&gt;</font>
- * &lt;exclude name="<font
color="darkred">avalon-framework.jar</font>" /&gt;
+ * &lt;exclude name="<font color="darkred">log4j.jar</font>" /&gt;
* <font color="gray">&lt;/fileset&gt;</font>
* </pre>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ExcludeDirective implements Serializable

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/FilesetDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/FilesetDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/FilesetDirective.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
* <p><b>XML</b></p>
* <pre>
* &lt;fileset dir="<font color="darkred">lib</font>"&gt;
- * &lt;include name="<font
color="darkred">avalon-framework.jar</font>"/&gt;
+ * &lt;include name="<font color="darkred">log4j.jar</font>"/&gt;
* &lt;include name="<font color="darkred">logkit.jar</font>"/&gt;
* &lt;exclude name="<font color="darkred">servlet.jar</font>"/&gt;
* &lt;/dirset&gt;
@@ -36,7 +36,7 @@
*
* @see IncludeDirective
* @see ExcludeDirective
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class FilesetDirective implements Serializable

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ImportDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ImportDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ImportDirective.java
Sun Jun 12 09:47:29 2005
@@ -31,13 +31,13 @@
*
* <font color="gray">
* &lt;--
- * Declare the import of the value of "urn:avalon:home" as a keyed context
+ * Declare the import of the value of "urn:metro:dir" as a keyed context
* entry using the key "home".
* --&gt;</font>
*
* <font color="gray">&lt;context&gt;</font>
* <font color="gray">&lt;entry key="home">&gt;</font>
- * &lt;import key="<font color="darkred">urn:avalon:home</font>"/&gt;
+ * &lt;import key="<font color="darkred">urn:metro:dir</font>"/&gt;
* <font color="gray">&lt;/entry&gt;</font>
* <font color="gray">&lt;/context&gt;</font>
* </pre>
@@ -45,7 +45,7 @@
* @see ContextDirective
* @see EntryDirective
* @see Parameter
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ImportDirective extends EntryDirective

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/IncludeDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/IncludeDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/IncludeDirective.java
Sun Jun 12 09:47:29 2005
@@ -30,11 +30,11 @@
* context.</p>
* <pre>
* <font color="gray">&lt;fileset dir="lib"&gt;</font>
- * &lt;include name="<font
color="darkred">avalon-framework.jar</font>" /&gt;
+ * &lt;include name="<font color="darkred">log4j.jar</font>" /&gt;
* <font color="gray">&lt;/fileset&gt;</font>
* </pre>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class IncludeDirective implements Serializable

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/LibraryDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/LibraryDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/LibraryDirective.java
Sun Jun 12 09:47:29 2005
@@ -35,11 +35,11 @@
* <pre>
* <font color="gray">&lt;library&gt;</font>
* &lt;include&gt;lib&lt;/include&gt;
- * &lt;group&gt;avalon-framework&lt;/group&gt;
+ * &lt;group&gt;log4j&lt;/group&gt;
* <font color="gray">&lt;/library&gt;</font>
* </pre>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class LibraryDirective
@@ -120,53 +120,4 @@
{
return m_groups;
}
-
- /**
- * Return the set of optional extension locations as a File[]
- * relative to a supplied base directory.
- *
- * @param base a base directory against which relatve references shall
be resolved
- * @return an array of extension library locations
- * @exception IOException if a path cannot be resolved to a directory
- * @exception NullArgumentException if the base argument is null.
- */
- public File[] getOptionalExtensionDirectories( File base )
- throws IOException, NullArgumentException
- {
- if( base == null )
- {
- throw new NullArgumentException( "base" );
- }
- String[] includes = getIncludes();
- ArrayList list = new ArrayList();
- for( int i=0; i<includes.length; i++ )
- {
- final String path = includes[i];
- list.add( getDirectory( base, path ) );
- }
- return (File[]) list.toArray( new File[0] );
- }
-
- private File getDirectory( File base, String path )
- throws IOException
- {
- File file = new File( path );
- if( file.isAbsolute() )
- {
- return verifyDirectory( file );
- }
- return verifyDirectory( new File( base, path ) );
- }
-
- private File verifyDirectory( File dir ) throws IOException
- {
- if( dir.isDirectory() )
- {
- return dir.getCanonicalFile();
- }
-
- final String error =
- "Path does not correspond to a directory: " + dir;
- throw new IOException( error );
- }
}

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/MetaDataException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/MetaDataException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/MetaDataException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a model related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class MetaDataException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/MetaDataRuntimeException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/MetaDataRuntimeException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/MetaDataRuntimeException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a model related runtime error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class MetaDataRuntimeException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/Mode.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/Mode.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/Mode.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
* The <code>Mode</code> class declares the EXPLICIT, PACKAGED or IMPLICIT
mode of creation of a profile.
*
* @see DeploymentProfile
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class Mode implements Serializable

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/NamedComponentProfile.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/NamedComponentProfile.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/NamedComponentProfile.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* A named deployment profile.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class NamedComponentProfile extends DeploymentProfile

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/Parameter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/Parameter.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/Parameter.java
Sun Jun 12 09:47:29 2005
@@ -57,7 +57,7 @@
*
* @see EntryDirective
* @see ImportDirective
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class Parameter implements Serializable

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ProfilePackage.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ProfilePackage.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ProfilePackage.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@
/**
* A collection of profiles packaged with a component type.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ProfilePackage implements Serializable

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/SelectionDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/SelectionDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/SelectionDirective.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
* depedency should be resolved relative to a set of supplied
* features and qualified values.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class SelectionDirective implements Serializable

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ServiceDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ServiceDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/ServiceDirective.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
* service together with a component implementation path reference,
referencing
* the component implementing the service.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ServiceDirective extends ServiceDescriptor

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/TargetDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/TargetDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/TargetDirective.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,7 @@
* seperated by "/" charaters qualifying the component that the target
* configuration is to be applied to.</p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class TargetDirective implements Serializable
@@ -59,11 +59,6 @@
*/
private final CategoriesDirective m_categories;

- /**
- * The name of a security profile to assign to a target.
- */
- private final String m_profile;
-

//========================================================================
// constructors

//========================================================================
@@ -74,15 +69,13 @@
* @param path target path
* @param configuration the configuration
* @param categories the logging category directives
- * @param profile a security profile
*/
public TargetDirective(
final String path,
final Configuration configuration,
- final CategoriesDirective categories,
- final String profile )
+ final CategoriesDirective categories )
{
- this( path, configuration, null, categories, profile );
+ this( path, configuration, null, categories );
}

/**
@@ -92,22 +85,18 @@
* @param configuration the configuration
* @param parameters the parameters
* @param categories the logging category directives
- * @param profile a security profile
*
- * @since 2.1.0
*/
public TargetDirective(
final String path,
final Configuration configuration,
final Parameters parameters,
- final CategoriesDirective categories,
- final String profile )
+ final CategoriesDirective categories )
{
m_path = path;
m_config = configuration;
m_params = parameters;
m_categories = categories;
- m_profile = profile;
}


@@ -146,16 +135,6 @@
}

/**
- * Return the name of the assigned security profile.
- *
- * @return the assigned profile name (possibly null)
- */
- public String getSecurityProfileName()
- {
- return m_profile;
- }
-
- /**
* Return the logging categories directive.
*
* @return the logging categories directive
@@ -174,8 +153,7 @@
return "[target: " + getPath() + ", "
+ (getConfiguration() != null ) + ", "
+ (getParameters() != null ) + ", "
- + (getCategoriesDirective() != null ) + ", "
- + (getSecurityProfileName() != null )
+ + (getCategoriesDirective() != null )
+ " ]";
}
}

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/Targets.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/Targets.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/data/Targets.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
* seperated by "/" charaters qualifying the component that the target
* configuration is to be applied to.</p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class Targets
@@ -119,8 +119,7 @@
new TargetDirective(
getKey( name ),
target.getConfiguration(),
- target.getCategoriesDirective(),
- target.getSecurityProfileName() ) );
+ target.getCategoriesDirective() ) );
}
}
}

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/event/CompositionEvent.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/event/CompositionEvent.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/event/CompositionEvent.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
* A event raised by a containment model as a result of the
* addition or removal of a subsidiary model.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class CompositionEvent extends java.util.EventObject

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/event/CompositionListener.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/event/CompositionListener.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/event/CompositionListener.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
/**
* A listener for model composition changes.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface CompositionListener extends EventListener

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/AssemblyException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/AssemblyException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/AssemblyException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception raised in response to a model assembly failure.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class AssemblyException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ClassLoaderModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ClassLoaderModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ClassLoaderModel.java
Sun Jun 12 09:47:29 2005
@@ -22,15 +22,13 @@
import java.security.CodeSource;

import net.dpml.composition.data.ContainmentProfile;
-import net.dpml.extension.manager.ExtensionManager;
-import net.dpml.extension.manager.OptionalPackage;
import net.dpml.logging.Logger;

/**
* <p>Specification of a classloader model from which a
* a fully qualifed classpath can be established.</p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ClassLoaderModel
@@ -51,30 +49,7 @@
ServiceRepository getServiceRepository();

/**
- * Return the optional extensions manager.
- * @return the extension manager
- */
- ExtensionManager getExtensionManager();
-
- /**
- * Return the set of local established optional packages.
- *
- * @return the local set of optional packages
- */
- OptionalPackage[] getOptionalPackages();
-
- /**
- * Return the set of optional packages already established including
- * the optional packages established by any parent classloader model.
- *
- * @param policy if TRUE, return the local and all ancestor optional
- * package - if FALSE only return the local packages
- * @return the OptionalPackage instances
- */
- OptionalPackage[] getOptionalPackages( boolean policy );
-
- /**
- * Return the fully qualified classpath including extension jar files
+ * Return the fully qualified classpath
* resolved relative to a classpath directives.
*
* @return an array of CodeSource instances representing the qualified
@@ -86,10 +61,7 @@
* Return the classloader for a containment context.
* An implementation is required to fulfill the the
* criteria expressed by the associated classloader
- * directive, and, deliver support for any optional
- * extension criteria expressed within a jar manifest
- * in accordance with the Java Optional Extensions
- * specification.
+ * directive.
*
* @return the classloader
*/

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/Commissionable.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/Commissionable.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/Commissionable.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* The Comissionable interface defines the contract for an manager
* of deployable components.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Commissionable

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/CommissioningException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/CommissioningException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/CommissioningException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception raised in response to an commissioning failure.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class CommissioningException extends CompositionException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ComponentModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ComponentModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ComponentModel.java
Sun Jun 12 09:47:29 2005
@@ -21,13 +21,12 @@
import net.dpml.configuration.Configuration;
import net.dpml.parameters.Parameters;
import net.dpml.meta.info.DependencyDescriptor;
-import net.dpml.meta.info.StageDescriptor;
import net.dpml.meta.info.Type;

/**
* Deployment model defintion.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ComponentModel extends DeploymentModel
@@ -188,22 +187,6 @@
DependencyModel getDependencyModel( DependencyDescriptor dependency );

/**
- * Return the stage models for this deployment model.
- *
- * @return the stage models
- */
- StageModel[] getStageModels();
-
- /**
- * Return a stage model matching the supplied descriptor or null
- * if no match found.
- *
- * @param stage the stage descriptor
- * @return the matching stage model
- */
- StageModel getStageModel( StageDescriptor stage );
-
- /**
* Return the set of services produced by the model as a array of classes.
*
* @return the service classes

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/CompositionException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/CompositionException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/CompositionException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a appliance related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class CompositionException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ContainmentModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ContainmentModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ContainmentModel.java
Sun Jun 12 09:47:29 2005
@@ -32,15 +32,13 @@
* a set of models. A containment model describes a logical containment
* context.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ContainmentModel extends DeploymentModel
{
String KEY = "urn:composition:containment.model";

- String SECURE_EXECUTION_KEY = "urn:composition:security.enabled";
-
/**
* Get the startup sequence for the model.
*/

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ContextModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ContextModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ContextModel.java
Sun Jun 12 09:47:29 2005
@@ -24,10 +24,10 @@
* <p>Specification of a context model from which a
* a fully qualifed context can be established.</p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
-public interface ContextModel extends Dependent
+public interface ContextModel
{
/**
* Return the classname of a custom casting class.
@@ -81,4 +81,8 @@
*/
Map getContextMap();

+
+ DeploymentModel getProvider();
+
+ void setProvider( DeploymentModel provider );
}

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/DependencyGraph.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/DependencyGraph.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/DependencyGraph.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
* <p>Utility class to aquire an ordered graph of
* consumers and providers models.</p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DependencyGraph

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/DependencyModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/DependencyModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/DependencyModel.java
Sun Jun 12 09:47:29 2005
@@ -25,10 +25,10 @@
* Dependency model handles the establishment of an explicit source
* provider defintion or service provider selection rules.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
-public interface DependencyModel extends Dependent
+public interface DependencyModel
{
/**
* Return the dependency descriptor for the model.
@@ -57,4 +57,8 @@
* @return the accepted candidates in ranked order
*/
ServiceDescriptor[] filter( ServiceDescriptor[] candidates );
+
+ DeploymentModel getProvider();
+
+ void setProvider( DeploymentModel provider );
}

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/DeploymentModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/DeploymentModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/DeploymentModel.java
Sun Jun 12 09:47:29 2005
@@ -18,13 +18,10 @@

package net.dpml.composition.model;

-import java.security.AccessControlContext;
-
import net.dpml.composition.data.Mode;

import net.dpml.meta.info.DependencyDescriptor;
import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.StageDescriptor;
import net.dpml.meta.info.ReferenceDescriptor;
import net.dpml.logging.Logger;
import net.dpml.logging.data.CategoriesDirective;
@@ -33,7 +30,7 @@
/**
* Model desribing a deployment scenario.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface DeploymentModel extends Commissionable, Resolver
@@ -84,12 +81,6 @@
*/
void setCategories( CategoriesDirective categories );

- /**
- * Return the access control context.
- * @return the access control context
- */
- AccessControlContext getAccessControlContext();
-
/**
* Return the default deployment timeout value declared in the
* kernel configuration. The implementation looks for a value
@@ -119,13 +110,6 @@

/**
* Return TRUE is this model is capable of supporting a supplied
- * stage dependency.
- * @return true if this model can fulfill the dependency
- */
- boolean isaCandidate( StageDescriptor stage );
-
- /**
- * Return TRUE is this model is capable of supporting a supplied
* service.
*
* @param reference the service reference descriptor
@@ -133,12 +117,6 @@
*/
boolean isaCandidate( ReferenceDescriptor reference );

- /**
- * Return the enabled status of the code security policy.
- * @return the code security enabled status
- */
- boolean isCodeSecurityEnabled();
-
//-----------------------------------------------------------
// composite assembly
//-----------------------------------------------------------

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/DuplicateNameException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/DuplicateNameException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/DuplicateNameException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception raised in response to a model assembly failure.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DuplicateNameException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/EntryModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/EntryModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/EntryModel.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* <p>Specification of a context enty model from which a
* a context value can be established.</p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface EntryModel

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/FatalCommissioningException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/FatalCommissioningException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/FatalCommissioningException.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
* JVM is not stable, and the container should terminate execution
* completely.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class FatalCommissioningException extends CommissioningException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/FileSelector.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/FileSelector.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/FileSelector.java
Sun Jun 12 09:47:29 2005
@@ -24,8 +24,7 @@
/**
* Interface used by implementations to filter files from candidate lists.
*
- * @author Apache Ant Development Team (Bruce Atherton)
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface FileSelector {

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/FilesetModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/FilesetModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/FilesetModel.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
* into set of fully qualifed filenames for purposes of establishing
* a classpath.</p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface FilesetModel {

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ModelException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ModelException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ModelException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a model related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ModelException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ModelRepository.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ModelRepository.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ModelRepository.java
Sun Jun 12 09:47:29 2005
@@ -20,14 +20,13 @@

import net.dpml.meta.info.DependencyDescriptor;
import net.dpml.meta.info.ReferenceDescriptor;
-import net.dpml.meta.info.StageDescriptor;

/**
* The model repository interface declares operations through which
* clients may resolve new or existing model instances relative to
- * a stage or service dependency.
+ * a service dependency.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ModelRepository
@@ -62,17 +61,7 @@
* @param dependency a component service dependency
* @return the candidate models
*/
- DeploymentModel[] getCandidateProviders(
- DependencyDescriptor dependency );
-
- /**
- * Locate all models meeting the supplied criteria.
- *
- * @param stage a component stage dependency
- * @return the candidate models
- */
- DeploymentModel[] getCandidateProviders(
- StageDescriptor stage );
+ DeploymentModel[] getCandidateProviders( DependencyDescriptor dependency
);

/**
* Locate all models meeting the supplied service reference criteria.
@@ -80,16 +69,7 @@
* @param reference a service reference
* @return the candidate models
*/
- public DeploymentModel[] getCandidateProviders(
- ReferenceDescriptor reference );
-
- /**
- * Locate a model meeting the supplied criteria.
- *
- * @param stage a component stage dependency
- * @return the model
- */
- DeploymentModel getModel( StageDescriptor stage );
+ DeploymentModel[] getCandidateProviders( ReferenceDescriptor reference );

/**
* Add an model to the repository.

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ModelRuntimeException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ModelRuntimeException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ModelRuntimeException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a model related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ModelRuntimeException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ModelSelector.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ModelSelector.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ModelSelector.java
Sun Jun 12 09:47:29 2005
@@ -20,7 +20,6 @@

import net.dpml.meta.info.DependencyDescriptor;
import net.dpml.meta.info.ReferenceDescriptor;
-import net.dpml.meta.info.StageDescriptor;

/**
* Interface implemented by a service selection implementation mechanism.
Classes
@@ -28,10 +27,10 @@
* candidate service providers in an automated assembly process.
* A component author may declare a selection class explicitly via a
* service dependency attribute with the attribute name of
- * <code>urn:avalon:profile.selector</code> (but this will change to a model
+ * <code>urn:metro:profile.selector</code> (but this will change to a model
* driven approach).
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ModelSelector
@@ -50,15 +49,6 @@
/**
* Returns the preferred model from an available selection of candidates
* @param models the set of candidate models
- * @param stage the stage dependency
- * @return the preferred provider or null if no satisfactory provider
- * can be established
- */
- DeploymentModel select( DeploymentModel[] models, StageDescriptor stage
);
-
- /**
- * Returns the preferred model from an available selection of candidates
- * @param models the set of candidate models
* @param reference the versioned service reference
* @return the preferred provider or null if no satisfactory provider
* can be established

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProfileDuplicateException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProfileDuplicateException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProfileDuplicateException.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* Exception raised in response to an attempt to override the defintion
* of an existing profile.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ProfileDuplicateException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProfileException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProfileException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProfileException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a profile related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ProfileException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProfileSelector.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProfileSelector.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProfileSelector.java
Sun Jun 12 09:47:29 2005
@@ -22,12 +22,11 @@

import net.dpml.meta.info.ReferenceDescriptor;
import net.dpml.meta.info.DependencyDescriptor;
-import net.dpml.meta.info.StageDescriptor;

/**
* Interface defining the contract for profile selection.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ProfileSelector
@@ -48,17 +47,6 @@
* candidates profiles.
*
* @param profiles the set of candidate profiles
- * @param stage a stage dependency
- * @return the preferred extension provider profile or null if
- * no satisfactory profile can be established
- */
- DeploymentProfile select( DeploymentProfile[] profiles, StageDescriptor
stage );
-
- /**
- * Returns the preferred profile from an available selection of
- * candidates profiles.
- *
- * @param profiles the set of candidate profiles
* @param reference a service reference
* @return the preferred profile or null if
* no satisfactory profile can be established

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProfileUnknownException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProfileUnknownException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProfileUnknownException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that a profile is unknown.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ProfileUnknownException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProviderNotFoundException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProviderNotFoundException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ProviderNotFoundException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception raised in response to a model provider resolution failure.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ProviderNotFoundException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/Reclaimer.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/Reclaimer.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/Reclaimer.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* Interface implementated by an handler that supports
* instance release.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Reclaimer

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/Resolver.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/Resolver.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/Resolver.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* The Resolver interface defines the contract for instance access and
* release.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Resolver

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ServiceDuplicateException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ServiceDuplicateException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ServiceDuplicateException.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* Exception raised in response to an attempt to override
* an existing service defintion.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ServiceDuplicateException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ServiceException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ServiceException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ServiceException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a service related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ServiceException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ServiceModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ServiceModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ServiceModel.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@
/**
* Service model manages service exported by a container.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ServiceModel

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ServiceRepository.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ServiceRepository.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/ServiceRepository.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
* A service repository provides support for the storage and retrival
* of service defintions.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ServiceRepository

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TransientRuntimeException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TransientRuntimeException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TransientRuntimeException.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@
* exception exposes a delay value which is the anticipated delay in
* service availability. A delay value of 0 indicates an unknown delay.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class TransientRuntimeException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeDuplicateException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeDuplicateException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeDuplicateException.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* Exception raised in response to an attempt to override the defintion
* of an existing type.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class TypeDuplicateException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a type related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class TypeException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeRepository.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeRepository.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeRepository.java
Sun Jun 12 09:47:29 2005
@@ -23,14 +23,13 @@

import net.dpml.meta.info.DependencyDescriptor;
import net.dpml.meta.info.ReferenceDescriptor;
-import net.dpml.meta.info.StageDescriptor;
import net.dpml.meta.info.Type;

/**
* A type manager implementation provides support for the creation,
* storage and retrival of component types.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface TypeRepository
@@ -100,13 +99,6 @@
*/
Type[] getTypes( ReferenceDescriptor reference, boolean search );

- /**
- * Locate the set of component types that provide the supplied extension.
- * @param stage a stage descriptor
- * @return a set of types that support the supplied stage
- */
- Type[] getTypes( StageDescriptor stage );
-
/**
* Return the set of deployment profiles for the supplied type. An
* implementation is required to return a array of types > 0 in length

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeRuntimeException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeRuntimeException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeRuntimeException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a type related runtime error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class TypeRuntimeException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeUnknownException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeUnknownException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/TypeUnknownException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that a type is unknown within the scope of a type
manager.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class TypeUnknownException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/UnknownServiceException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/UnknownServiceException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/main/net/dpml/composition/model/UnknownServiceException.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* Exception to indicate that a service defintioon is unknown within
* the scope of a service manager.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class UnknownServiceException

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ComponentProfileTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ComponentProfileTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ComponentProfileTestCase.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,6 @@
import net.dpml.composition.data.DeploymentProfile;
import net.dpml.composition.data.ImportDirective;
import net.dpml.composition.data.Mode;
-import net.dpml.composition.data.StageDirective;

import net.dpml.configuration.Configuration;

@@ -43,7 +42,7 @@
/**
* ProfileTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ComponentProfileTestCase extends TestCase
@@ -55,7 +54,6 @@
private Configuration m_configuration;
private ContextDirective m_context;
private DependencyDirective[] m_dependencies;
- private StageDirective[] m_stages;
private String m_name;
private String m_classname;
private int m_collection;
@@ -73,7 +71,6 @@
new ContextDirective( getClass().getName(), new ImportDirective[0]
);
m_configuration = new DefaultConfiguration("test");
m_dependencies = new DependencyDirective[0];
- m_stages = new StageDirective[0];
m_parameters = new DefaultParameters( System.getProperties(), true );
m_activation = DeploymentProfile.ENABLED;
m_mode = Mode.IMPLICIT;
@@ -85,7 +82,7 @@
{
ComponentProfile profile = new ComponentProfile(
m_name, m_activation, m_collection, m_classname, m_categories,
- m_context, m_dependencies, m_stages, m_parameters,
+ m_context, m_dependencies, m_parameters,
m_configuration, m_mode );

assertEquals( "name", m_name, profile.getName() );

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ConstructorDirectiveTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ConstructorDirectiveTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ConstructorDirectiveTestCase.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
/**
* ConstructorDirectiveTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ConstructorDirectiveTestCase extends TestCase

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ContextDirectiveTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ContextDirectiveTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ContextDirectiveTestCase.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
/**
* ContextDirectiveTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ContextDirectiveTestCase extends TestCase

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ImportDirectiveTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ImportDirectiveTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ImportDirectiveTestCase.java
Sun Jun 12 09:47:29 2005
@@ -27,7 +27,7 @@
/**
* ImportDirectiveTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ImportDirectiveTestCase extends TestCase

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/MetaDataExceptionTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/MetaDataExceptionTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/MetaDataExceptionTestCase.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
/**
* MetaDataExceptionTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class MetaDataExceptionTestCase extends TestCase

Modified:
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ParameterTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ParameterTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/api/src/test/net/dpml/composition/data/test/ParameterTestCase.java
Sun Jun 12 09:47:29 2005
@@ -27,7 +27,7 @@
/**
* ParameterTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ParameterTestCase extends TestCase

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/CompositionContentHandlerFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/CompositionContentHandlerFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/CompositionContentHandlerFactory.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
* A CompositionContentHandlerFactory handles creation of ContainmentProfile
* content factories.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: ContainmentProfileBuilder.java 259 2004-10-30 07:24:40Z
mcconnell $
*/
public final class CompositionContentHandlerFactory implements
ContentHandlerFactory

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/ContainmentProfileBuilder.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/ContainmentProfileBuilder.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/ContainmentProfileBuilder.java
Sun Jun 12 09:47:29 2005
@@ -41,7 +41,7 @@
* A ContainmentProfileBuilder is responsible for building {@link
ContainmentProfile}
* objects from a configuration object.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ContainmentProfileBuilder extends ContentHandler
implements ContainmentProfileCreator

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/ProfilePackageBuilder.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/ProfilePackageBuilder.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/ProfilePackageBuilder.java
Sun Jun 12 09:47:29 2005
@@ -31,7 +31,7 @@
* A ProfileBuilder is responsible for building a {@link ProfilePackage}
* object from a source.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ProfilePackageBuilder implements ProfilePackageCreator

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/SerializedContainmentProfileCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/SerializedContainmentProfileCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/SerializedContainmentProfileCreator.java
Sun Jun 12 09:47:29 2005
@@ -27,7 +27,7 @@
* Create {@link ContainmentProfile} from stream made up of
* serialized object.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class SerializedContainmentProfileCreator

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/SerializedProfilePackageCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/SerializedProfilePackageCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/SerializedProfilePackageCreator.java
Sun Jun 12 09:47:29 2005
@@ -27,7 +27,7 @@
* Create {@link ProfilePackage} from stream made up of
* serialized object.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class SerializedProfilePackageCreator

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/SerializedTargetsCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/SerializedTargetsCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/SerializedTargetsCreator.java
Sun Jun 12 09:47:29 2005
@@ -27,7 +27,7 @@
/**
* Create {@link Targets} from stream made up of serialized object.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class SerializedTargetsCreator

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/TargetsBuilder.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/TargetsBuilder.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/TargetsBuilder.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,7 @@
* A TargetsBuilderis responsible for building {@link Targets}
* objects from a configuration object.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class TargetsBuilder implements TargetsCreator

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLComponentProfileCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLComponentProfileCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLComponentProfileCreator.java
Sun Jun 12 09:47:29 2005
@@ -21,6 +21,7 @@

import net.dpml.logging.data.CategoriesDirective;

+import net.dpml.parameters.ParameterException;
import net.dpml.parameters.Parameters;
import net.dpml.parameters.impl.DefaultParameters;

@@ -38,14 +39,13 @@
import net.dpml.composition.data.Mode;
import net.dpml.composition.data.Parameter;
import net.dpml.composition.data.SelectionDirective;
-import net.dpml.composition.data.StageDirective;

import net.dpml.meta.info.InfoDescriptor;


/**
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class XMLComponentProfileCreator extends XMLProfileCreator
@@ -57,7 +57,7 @@
* @return the deployment profile
*/
public ComponentProfile createComponentProfile( Configuration config )
- throws Exception
+ throws Exception
{
String classname = config.getAttribute( "class", null );
if( null == classname )
@@ -77,9 +77,8 @@
* @param config the configuration describing the component deployment
scenario
* @return the deployment profile
*/
- public ComponentProfile createComponentProfile(
- String base, String classname, Configuration config )
- throws Exception
+ public ComponentProfile createComponentProfile( String base, String
classname, Configuration config )
+ throws Exception
{
final String name = getName( base, config, "untitled" );
return createComponentProfile( classname, config, name );
@@ -92,30 +91,22 @@
* @param config the configuration describing the component deployment
scenario
* @return the deployment profile
*/
- public ComponentProfile createComponentProfile(
- String classname, Configuration config, String name )
- throws Exception
- {
- final int activation =
- getActivationDirective( config, DeploymentProfile.DEFAULT );
- final int collection = getCollectionPolicy( config );
-
- final CategoriesDirective categories =
- getCategoriesDirective( config.getChild( "categories", false ) );
- final ContextDirective context =
- getContextDirective( config.getChild( "context", false ) );
- final DependencyDirective[] dependencies =
- getDependencyDirectives( config.getChild( "dependencies" ) );
- final StageDirective[] stages =
- getStageDirectives( config.getChild( "stages" ) );
- final Parameters params =
- getParameters( config.getChild( "parameters", false ) );
- final Configuration configuration =
- config.getChild( "configuration", true );
+ public ComponentProfile createComponentProfile( String classname,
Configuration config, String name )
+ throws Exception
+ {
+ int activation = getActivationDirective( config,
DeploymentProfile.DEFAULT );
+ int collection = getCollectionPolicy( config );
+
+ CategoriesDirective categories = getCategoriesDirective(
config.getChild( "categories", false ) );
+ ContextDirective context = getContextDirective( config.getChild(
"context", false ) );
+ DependencyDirective[] dependencies = getDependencyDirectives(
config.getChild( "dependencies" ) );
+ Parameters params = getParameters( config.getChild( "parameters",
false ) );
+ Configuration configuration = config.getChild( "configuration", true
);

return new ComponentProfile(
- name, activation, collection, classname, categories, context,
dependencies,
- stages, params, configuration, Mode.EXPLICIT );
+ name, activation, collection, classname, categories, context,
+ dependencies, params, configuration, Mode.EXPLICIT
+ );
}

/**
@@ -132,7 +123,7 @@
}

protected DependencyDirective[] getDependencyDirectives( Configuration
config )
- throws ConfigurationException
+ throws ConfigurationException
{
if( config != null )
{
@@ -148,7 +139,7 @@
}

protected DependencyDirective getDependencyDirective( Configuration
config )
- throws ConfigurationException
+ throws ConfigurationException
{
final String key = config.getAttribute( "key" );
final String source = config.getAttribute( "source", null );
@@ -170,47 +161,8 @@
}
}

- protected StageDirective[] getStageDirectives( Configuration config )
- throws ConfigurationException
- {
- if( config != null )
- {
- ArrayList list = new ArrayList();
- Configuration[] deps = config.getChildren( "stage" );
- for( int i=0; i<deps.length; i++ )
- {
- list.add( getStageDirective( deps[i] ) );
- }
- return (StageDirective[]) list.toArray( new StageDirective[0] );
- }
- return new StageDirective[0];
- }
-
- protected StageDirective getStageDirective( Configuration config )
- throws ConfigurationException
- {
- final String key = config.getAttribute( "key" );
- final String source = config.getAttribute( "source", null );
- if( source != null )
- {
- return new StageDirective( key, source );
- }
- else
- {
- Configuration[] children = config.getChildren( "select" );
- ArrayList list = new ArrayList();
- for( int i=0; i<children.length; i++ )
- {
- list.add( getSelectionDirective( children[i] ) );
- }
- SelectionDirective[] features =
- (SelectionDirective[]) list.toArray( new SelectionDirective[0]
);
- return new StageDirective( key, features );
- }
- }
-
protected SelectionDirective getSelectionDirective( Configuration config
)
- throws ConfigurationException
+ throws ConfigurationException
{
final String feature = config.getAttribute( "feature" );
final String value = config.getAttribute( "value" );
@@ -220,7 +172,7 @@
}

protected Parameters getParameters( Configuration config )
- throws ConfigurationException
+ throws ParameterException
{
if( config != null )
{
@@ -246,10 +198,7 @@

if( config.getChildren( "import" ).length > 0 )
{
- final String error =
- "The 'context' tag format has changed."
- + " Please check Merlin home for details "
- + "http://avalon.apache.org/merlin";;
+ final String error = "The 'context' tag format has changed.";
throw new ConfigurationException( error );
}

@@ -289,66 +238,11 @@
throws ConfigurationException
{
final String key = conf.getAttribute( "key" );
- final String classname = conf.getAttribute( "class", null );
- if( ( null != classname ) || ( null != conf.getValue( null ) ) )
- {
- String value = conf.getValue( null );
- if( null != value )
- {
- return new ConstructorDirective(
- key, classname, value );
- }
- else
- {
- Configuration[] configs = conf.getChildren( "param" );
- Parameter[] params = getParameters( configs );
- return new ConstructorDirective( key, classname, params );
- }
- }
- else
- {
- //
- // its using the legacy constructor and import approach
- //
-
- final Configuration[] children = conf.getChildren();
- if( children.length != 1 )
- {
- final String error =
- "Entry '" + key + "' does not contain one child element.";
- throw new ConfigurationException( error );
- }
-
- Configuration child = children[0];
- final String name = child.getName();
- if( name.equals( "import" ) )
- {
- final String importKey = child.getAttribute( "key" );
- return new ImportDirective( key, importKey );
- }
- else if( name.equals( "constructor" ) )
- {
- final String constructorClassname =
- child.getAttribute( "class", "java.lang.String" );
- Configuration[] paramsConf = child.getChildren( "param" );
- if( paramsConf.length > 0 )
- {
- Parameter[] params = getParameters( paramsConf );
- return new ConstructorDirective( key,
constructorClassname, params );
- }
- else
- {
- return new ConstructorDirective(
- key, constructorClassname, (String) child.getValue(
null ) );
- }
- }
- else
- {
- final String error =
- "Entry child unrecognized: " + name;
- throw new ConfigurationException( error );
- }
- }
+ final String classname = conf.getAttribute( "class" );
+
+ Configuration[] configs = conf.getChildren( "param" );
+ Parameter[] params = getParameters( configs );
+ return new ConstructorDirective( key, classname, params );
}



Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLContainmentProfileCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLContainmentProfileCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLContainmentProfileCreator.java
Sun Jun 12 09:47:29 2005
@@ -46,7 +46,7 @@
* Handles internalization of an XML based description of a {@link
ContainmentProfile}
* from a Configuration object.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class XMLContainmentProfileCreator extends XMLProfileCreator
@@ -76,32 +76,15 @@

String name = getName( null, config, "untitled" );

- ServiceDirective[] exports =
- createServiceDirectives( config.getChild( "services", false ) );
+ ServiceDirective[] exports = createServiceDirectives(
config.getChild( "services", false ) );

- //
- // check for any legacy "implementation" tags and if it exists
- // then run with it, otherwise continue with the container defintion
- //
-
-/* NH: implementation is assigned but not used later...
- so removing this code does not make it worse, but it could be a bug...
- Configuration implementation = config;
- if( config.getChild( "implementation", false ) != null )
- {
- implementation = config.getChild( "implementation" );
- }
-*/
- ClassLoaderDirective classloader =
- createClassLoaderDirective(
- config.getChild( "classloader", false ) );
+ ClassLoaderDirective classloader = createClassLoaderDirective(
config.getChild( "classloader", false ) );

//
// build any logging category directives
//

- final CategoriesDirective categories =
- getCategoriesDirective( config.getChild( "categories", false ) );
+ final CategoriesDirective categories = getCategoriesDirective(
config.getChild( "categories", false ) );

//
// build nested profiles
@@ -117,22 +100,20 @@
}

private ClassLoaderDirective createClassLoaderDirective( Configuration
config )
- throws ConfigurationException
+ throws ConfigurationException
{
if( config == null )
{
return null;
}

- LibraryDirective library =
- createLibraryDirective( config.getChild( "library", false ) );
- ClasspathDirective classpath =
- createClasspathDirective( config.getChild( "classpath", false ) );
+ LibraryDirective library = createLibraryDirective( config.getChild(
"library", false ) );
+ ClasspathDirective classpath = createClasspathDirective(
config.getChild( "classpath", false ) );
return new ClassLoaderDirective( library, classpath );
}

private ClasspathDirective createClasspathDirective( Configuration
config )
- throws ConfigurationException
+ throws ConfigurationException
{
if( config == null )
{
@@ -145,7 +126,7 @@
}

private LibraryDirective createLibraryDirective( Configuration config )
- throws ConfigurationException
+ throws ConfigurationException
{
if( config == null )
{

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLProfileCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLProfileCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLProfileCreator.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@

/**
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public abstract class XMLProfileCreator

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLProfilePackageCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLProfilePackageCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLProfilePackageCreator.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@

/**
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class XMLProfilePackageCreator

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLTargetsCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLTargetsCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/builder/XMLTargetsCreator.java
Sun Jun 12 09:47:29 2005
@@ -25,6 +25,7 @@
import net.dpml.configuration.Configuration;
import net.dpml.configuration.ConfigurationException;

+import net.dpml.parameters.ParameterException;
import net.dpml.parameters.Parameters;
import net.dpml.parameters.impl.DefaultParameters;

@@ -32,7 +33,7 @@
* Handles internalization of an XML based description of a {@link Targets}
* instance from a Configuration object.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class XMLTargetsCreator extends XMLComponentProfileCreator
@@ -87,18 +88,7 @@
// get the address of the object we are overriding
//

- String name = config.getAttribute( "name", null ); // legacy
- if( name == null )
- {
- name = config.getAttribute( "path" );
- }
-
- //
- // get the applicable secuirity profile
- //
-
- Configuration security = config.getChild( "security" );
- String profile = security.getAttribute( "profile", null );
+ String name = config.getAttribute( "path" );

//
// get the assigned categories
@@ -125,13 +115,14 @@
// and create the target directive
//

- return new TargetDirective( name, conf, params, categories, profile
);
+ return new TargetDirective( name, conf, params, categories );
}

- private Parameters getTargetParameters( Configuration config ) throws
ConfigurationException
+ private Parameters getTargetParameters( Configuration config )
+ throws ParameterException
{
if( null == config )
- return null;
+ return null;
return DefaultParameters.fromConfiguration( config );
}


Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/writer/SerializedContainmentProfileWriter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/writer/SerializedContainmentProfileWriter.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/writer/SerializedContainmentProfileWriter.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
/**
* Write {@link ContainmentProfile} objects to a stream as serialized
objects.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class SerializedContainmentProfileWriter

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/writer/XMLComponentProfileWriter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/writer/XMLComponentProfileWriter.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/writer/XMLComponentProfileWriter.java
Sun Jun 12 09:47:29 2005
@@ -35,7 +35,6 @@
import net.dpml.composition.data.ImportDirective;
import net.dpml.composition.data.EntryDirective;
import net.dpml.composition.data.ConstructorDirective;
-import net.dpml.composition.data.StageDirective;
import net.dpml.composition.data.Parameter;

import net.dpml.logging.data.CategoriesDirective;
@@ -47,7 +46,7 @@
/**
* Write a {@link ComponentProfile} to a stream as xml documents.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class XMLComponentProfileWriter
@@ -135,7 +134,6 @@
writeCategories( writer, profile.getCategories(), pad );
writeContext( writer, profile.getContext(), pad );
writeDependencies( writer, profile.getDependencyDirectives(), pad );
- writeStages( writer, profile.getStageDirectives(), pad );
writeConfiguration( writer, profile.getConfiguration(), pad );
writeParameters( writer, profile.getParameters(), pad );
}
@@ -191,57 +189,6 @@
}

/**
- * Write out xml representation of the dependency directives.
- *
- * @param writer the writer
- * @param stages the stages directives
- * @param pad the whitespace padding string
- * @throws IOException if unable to write xml
- */
- private void writeStages(
- final Writer writer, final StageDirective[] stages, String pad )
- throws IOException
- {
- if( stages.length == 0 ) return;
- writer.write( "\n" + pad + "<stages>" );
- final String padding = pad + INDENT;
- for( int i=0; i<stages.length; i++ )
- {
- writeStage( writer, stages[i], padding );
- }
- writer.write( "\n" + pad + "</stages>" );
- }
-
- /**
- * Write out xml representation of a stage directive.
- *
- * @param writer the writer
- * @param stage the stage directive
- * @throws IOException if unable to write xml
- */
- private void writeStage(
- final Writer writer, final StageDirective stage, String pad )
- throws IOException
- {
- writer.write( "\n" + pad + "<stage key=\"" + stage.getKey() + "\"" );
- if( stage.getSource() != null )
- {
- writer.write( " source=\"" + stage.getSource() + "\"/>" );
- }
- else
- {
- writer.write( ">" );
- SelectionDirective[] features = stage.getSelectionDirectives();
- final String padding = pad + INDENT;
- for( int i=0; i<features.length; i++ )
- {
- writeSelectionDirective( writer, features[i], padding );
- }
- writer.write( "\n" + pad + "</stage>" );
- }
- }
-
- /**
* Write out xml representation of a selection directive.
*
* @param writer the writer

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/writer/XMLContainmentProfileWriter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/writer/XMLContainmentProfileWriter.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/data/writer/XMLContainmentProfileWriter.java
Sun Jun 12 09:47:29 2005
@@ -40,7 +40,7 @@
/**
* Write {@link ContainmentProfile} objects to a stream as xml documents.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class XMLContainmentProfileWriter extends XMLComponentProfileWriter

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/CommissionRequest.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/CommissionRequest.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/CommissionRequest.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@

/**
* A deployment request handler.
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
class CommissionRequest

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/Commissioner.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/Commissioner.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/Commissioner.java
Sun Jun 12 09:47:29 2005
@@ -31,7 +31,7 @@
* list of commissioning requests which are queued on a first come first
* serve basis.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
* @see CommissionRequest
*/

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultClassLoaderContext.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultClassLoaderContext.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultClassLoaderContext.java
Sun Jun 12 09:47:29 2005
@@ -31,9 +31,6 @@

import net.dpml.context.impl.DefaultContext;

-import net.dpml.extension.manager.ExtensionManager;
-import net.dpml.extension.manager.OptionalPackage;
-
import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;

@@ -49,7 +46,7 @@
/**
* Implementation of a system context that exposes a system wide set of
parameters.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultClassLoaderContext extends DefaultContext
@@ -77,13 +74,7 @@
private final ClassLoader m_parent;

/**
- * Option packages established through the chain of parent
- * models.
- */
- private final OptionalPackage[] m_packages;
-
- /**
- * The base directory for resolution of extension directories and
+ * The base directory for resolution of
* fileset directories.
*/
private final File m_base;
@@ -94,11 +85,6 @@
private final Repository m_repository;

/**
- * The optional extensions package manager.
- */
- private final ExtensionManager m_manager;
-
- /**
* The parent type manager.
*/
private final TypeRepository m_types;
@@ -139,8 +125,7 @@
Logger logger, SystemContext system,
ClassLoader parent, ClassLoaderDirective directive )
{
- this( logger, system, parent,
- new OptionalPackage[0], null, null, null, directive, null );
+ this( logger, system, parent, null, null, directive, null );
}

/**
@@ -149,10 +134,6 @@
* @param logger the logging channel to assign to the classloader model
* @param system the system context
* @param parent the parent classloader
- * @param packages the set of optional packages established under
- * current classloader chain
- * @param manager the optional extions package manager established
- * by the parent classloader
* @param types the parent type manager
* @param services the parent service manager
* @param directive the classloader directive
@@ -162,8 +143,8 @@
*/
public DefaultClassLoaderContext(
Logger logger, SystemContext system,
- ClassLoader parent, OptionalPackage[] packages,
- ExtensionManager manager, TypeRepository types,
+ ClassLoader parent,
+ TypeRepository types,
ServiceRepository services,
ClassLoaderDirective directive,
URL[] implied )
@@ -178,10 +159,6 @@
{
throw new NullArgumentException( "parent" );
}
- if( packages == null )
- {
- throw new NullArgumentException( "packages" );
- }
if( directive == null )
{
throw new NullArgumentException( "directive" );
@@ -195,8 +172,6 @@
m_repository = system.getRepository();
m_base = system.getAnchorDirectory();
m_parent = parent;
- m_packages = packages;
- m_manager = manager;
m_types = types;
m_services = services;
m_directive = directive;
@@ -263,27 +238,6 @@
}

/**
- * Return the containment classloader.
- *
- * @return the classloader
- */
- public OptionalPackage[] getOptionalPackages()
- {
- return m_packages;
- }
-
- /**
- * Return the extension manager established by the parent
- * classloader model.
- *
- * @return the extension manager
- */
- public ExtensionManager getExtensionManager()
- {
- return m_manager;
- }
-
- /**
* Return the type repository established by the parent classloader.
*
* @return the type repository

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultClassLoaderModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultClassLoaderModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultClassLoaderModel.java
Sun Jun 12 09:47:29 2005
@@ -48,15 +48,6 @@

import net.dpml.composition.provider.ClassLoaderContext;

-import net.dpml.extension.Extension;
-
-import net.dpml.extension.manager.ExtensionManager;
-import net.dpml.extension.manager.OptionalPackage;
-import net.dpml.extension.manager.PackageManager;
-
-import net.dpml.extension.manager.impl.DefaultExtensionManager;
-import net.dpml.extension.manager.impl.DelegatingExtensionManager;
-
import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;

@@ -80,24 +71,11 @@
* <p>The classpath established by this model implementation
* applies the following logic:</p>
* <ul>
- * <li>establish an extensions manager relative to the
- * &lt;library/&gt> directives</li>
* <li>build an uqualifed classpath relative to the
* &lt;classpath/&gt> directives</li>
- * <li>resolve any optional jar file extension jar file
- * entries based on the manifest declarations of
- * the unqualified classpath, together with recursive
- * resolution of resolved optional extensions</li>
- * <li>consolidate the generated classpath relative to
- * the optional extensions established by any parent
- * classloader models</li>
* </ul>
- * <p>
- * Class dependencies include the util i18n, the assembly
- * repository package, the avalon framework and meta packages,
- * and the extensions package.
- * </p>
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultClassLoaderModel
@@ -116,14 +94,8 @@

private final ClassLoaderContext m_context;

- private final ExtensionManager m_extension;
-
- private final PackageManager m_manager;
-
private final String[] m_classpath;

- private final OptionalPackage[] m_packages;
-
private final URL[] m_urls;

private final URLClassLoader m_classLoader;
@@ -171,27 +143,10 @@

ClassLoaderDirective directive = context.getClassLoaderDirective();

- ExtensionManager manager =
- context.getExtensionManager();
URL[] implicit = context.getImplicitURLs();

try
{
- if( manager != null )
- {
- DefaultExtensionManager local =
- new DefaultExtensionManager(
- directive.getLibrary().getOptionalExtensionDirectories(
base ) );
- m_extension = new DelegatingExtensionManager(
- new ExtensionManager[]{ manager, local } );
- }
- else
- {
- m_extension = new DefaultExtensionManager(
- directive.getLibrary().getOptionalExtensionDirectories(
base ) );
- }
-
- m_manager = new PackageManager( m_extension );
m_classpath = createClassPath( base, directive, implicit );

if( getLocalLogger().isDebugEnabled() )
@@ -201,8 +156,6 @@
getLocalLogger().debug( str );
}

- m_packages = buildOptionalPackages(
- m_classpath, context.getOptionalPackages() );
m_urls = buildQualifiedClassPath();
//m_classLoader =
// new StandardClassLoader(
@@ -293,61 +246,13 @@
}

/**
- * Return the optional extensions manager.
- * @return the extension manager
- */
- public ExtensionManager getExtensionManager()
- {
- return m_extension;
- }
-
- /**
- * Return the set of local established optional packages.
- *
- * @return the local set of optional packages
- */
- public OptionalPackage[] getOptionalPackages()
- {
- return getOptionalPackages( false );
- }
-
- /**
- * Return the set of optional packages already established including
- * the optional packages established by any parent classloader model.
- *
- * @param policy if TRUE, return the local and all ancestor optional
- * package - if FALSE only return the local packages
- * @return the OptionalPackage instances
- */
- public OptionalPackage[] getOptionalPackages( boolean policy )
- {
- if( !policy )
- {
- return m_packages;
- }
-
- final ArrayList list = new ArrayList();
- OptionalPackage[] available = m_context.getOptionalPackages();
- for( int i=0; i<available.length; i++ )
- {
- list.add( available[i] );
- }
- for( int i=0; i<m_packages.length; i++ )
- {
- list.add( m_packages[i] );
- }
-
- return (OptionalPackage[]) list.toArray( new OptionalPackage[0] );
- }
-
- /**
- * Return the fully qualified classpath including extension jar files
+ * Return the fully qualified classpath
* resolved relative to the classpath directives in the meta-data
* and any parent classloader models.
*
* WARNING: lots of updates needed to properly populate the returned
* code source with certificates used to verify repository content which
- * means updating the extension utilities and the repository package.
+ * means updating the repository package.
* Currently the code sources returned contain an empty certificates
* array.
*
@@ -390,13 +295,12 @@
Logger logger, ContainmentProfile profile, URL[] implied )
{
SystemContext system = m_context.getSystemContext();
- OptionalPackage[] packages = getOptionalPackages();
ClassLoaderDirective directive =
profile.getClassLoaderDirective();

return new DefaultClassLoaderContext(
- logger, system, m_classLoader, packages,
- m_extension, m_types, m_services, directive, implied );
+ logger, system, m_classLoader,
+ m_types, m_services, directive, implied );
}

private String[] getClassPath()
@@ -405,7 +309,7 @@
}

/**
- * Build the fully qulalified classpath including extension jar files
+ * Build the fully qulalified classpath
* resolved relative to the classpath directives in the meta-data.
*
* @return an array of URL representing the complete classpath
@@ -424,11 +328,6 @@
list.add( url );
}
}
- File[] extensions = OptionalPackage.toFiles( getOptionalPackages() );
- for( int i=0; i<extensions.length; i++ )
- {
- list.add( extensions[i].toURL() );
- }
return (URL[]) list.toArray( new URL[0] );
}

@@ -518,104 +417,8 @@
return (String[]) classpath.toArray( new String[0] );
}

- /**
- * Retrieve the files for the optional packages required by
- * the jars in ClassPath.
- *
- * @param classPath the Classpath array
- * @return the files that need to be added to ClassLoader
- * @exception Exception if a extension error occurs
- */
-// private OptionalPackage[] buildOptionalPackages( final String[]
classPath )
-// throws Exception
-// {
-// return buildOptionalPackages( classPath, new OptionalPackage[0] );
-// }
-
- /**
- * Retrieve the files for the optional packages required by
- * the jars in the ClassPath.
- *
- * @param classPath the Classpath array
- * @return the files that need to be added to ClassLoader
- * @exception Exception if a extension error occurs
- */
- private OptionalPackage[] buildOptionalPackages(
- final String[] classPath, final OptionalPackage[] established )
- throws Exception
- {
- final ArrayList unsatisfied = new ArrayList();
- final ArrayList dependencies = new ArrayList();
- for( int i=0; i<established.length; i++ )
- {
- dependencies.add( established[i] );
- }
-
- final Manifest[] manifests = getManifests( classPath );
- final Extension[] available = Extension.getAvailable( manifests );
- final Extension[] required = Extension.getRequired( manifests );
-
- m_manager.scanDependencies(
- required, available, dependencies, unsatisfied );
- if( 0 != unsatisfied.size() )
- {
- final int size = unsatisfied.size();
- final String message =
- REZ.getString(
- "classloader.unsatisfied-extensions.error",
- new Integer( size ) );
- StringBuffer buffer = new StringBuffer( message );
- for( int i = 0; i < size; i++ )
- {
- final Extension extension = (Extension) unsatisfied.get( i );
- final Object[] params = new Object[]
- {
- extension.getExtensionName(),
- extension.getSpecificationVendor(),
- extension.getSpecificationVersion(),
- extension.getImplementationVendor(),
- extension.getImplementationVendorID(),
- extension.getImplementationVersion(),
- extension.getImplementationURL()
- };
- final String entry = REZ.format(
- "classloader.missing.extension.error", params );
- buffer.append( "\n" + entry );
- }
- throw new ModelException( buffer.toString() );
- }
-
- final OptionalPackage[] packages =
- (OptionalPackage[]) dependencies.toArray( new
OptionalPackage[0] );
- return consolidate( packages, established );
- }
-
- private OptionalPackage[] consolidate(
- OptionalPackage[] includes, OptionalPackage[] excludes )
- {
- ArrayList list = new ArrayList();
- for( int i=0; i<includes.length; i++ )
- {
- boolean skip = false;
- OptionalPackage inc = includes[i];
- File file = inc.getFile();
- for( int j=0; j<excludes.length; j++ )
- {
- if( file.equals( excludes[j].getFile() ) );
- skip = true;
- break;
- }
- if( !skip )
- {
- list.add( inc );
- }
- }
- return (OptionalPackage[]) list.toArray(
- new OptionalPackage[0] );
- }
-
private void addToClassPath( List list, File[] files )
- throws IOException
+ throws IOException
{
for( int i=0; i<files.length; i++ )
{
@@ -624,55 +427,13 @@
}

private void addToClassPath( List list, File file )
- throws IOException
+ throws IOException
{
File canonical = file.getCanonicalFile();
String uri = canonical.toURL().toString();
list.add( uri );
}

- private Manifest[] getManifests( final String[] classPath )
- throws ModelException
- {
- final ArrayList manifests = new ArrayList();
- for( int i = 0; i < classPath.length; i++ )
- {
- final String element = classPath[i];
-
- if( element.endsWith( ".jar" ) || element.startsWith( "jar:" ) )
- {
- try
- {
- URL url;
- if( element.startsWith( "jar:" ) )
- {
- url = new URL( element );
- }
- else
- {
- url = new URL( "jar:" + element + "!/" );
- }
-
- final JarURLConnection connection =
- (JarURLConnection) url.openConnection();
- final Manifest manifest = connection.getManifest();
- if( null != manifest )
- {
- manifests.add( manifest );
- }
- }
- catch( final IOException ioe )
- {
- final String message =
- REZ.getString(
"classloader.bad-classpath-entry.error", element );
- throw new ModelException( message, ioe );
- }
- }
- }
- return (Manifest[]) manifests.toArray( new Manifest[0] );
- }
-
-
/**
* Return an array of files corresponding to the expansion
* of the filesets declared within the directive.
@@ -742,7 +503,6 @@
/**
* Stream handler factory assigned to a classloader.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital
Product Meta Library</a>
* @version $Id$
*/
public static class ArtifactURLStreamHandlerFactory

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultComponentContext.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultComponentContext.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultComponentContext.java
Sun Jun 12 09:47:29 2005
@@ -45,7 +45,7 @@
* as the primary constructor argument when creating a new component
* model.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultComponentContext extends DefaultDeploymentContext

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultComponentModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultComponentModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultComponentModel.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,6 @@
import net.dpml.composition.data.DependencyDirective;
import net.dpml.composition.data.DeploymentProfile;
import net.dpml.composition.data.Mode;
-import net.dpml.composition.data.StageDirective;

import net.dpml.composition.model.ComponentModel;
import net.dpml.composition.model.ContextModel;
@@ -38,10 +37,8 @@
import net.dpml.composition.model.DeploymentModel;
import net.dpml.composition.model.ModelException;
import net.dpml.composition.model.ModelRuntimeException;
-import net.dpml.composition.model.StageModel;

import net.dpml.composition.provider.ComponentContext;
-import net.dpml.composition.provider.SecurityModel;

import net.dpml.composition.util.XercesSchemaValidator;

@@ -63,7 +60,6 @@
import net.dpml.meta.info.InfoDescriptor;
import net.dpml.meta.info.ReferenceDescriptor;
import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.StageDescriptor;
import net.dpml.meta.info.Type;

import net.dpml.parameters.Parameterizable;
@@ -73,7 +69,7 @@
/**
* Deployment model defintion.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* Library </a>
* @version $Id$
*/
@@ -84,22 +80,16 @@
// static
// --------------------------------------------------------------

- private static final Resources REZ =
ResourceManager
-
.getPackageResources( DefaultComponentModel.class );
+ private static final Resources REZ;

- private static final Configuration EMPTY_CONFIGURATION =
new DefaultConfiguration(
-
"configuration",
-
ComponentModel.class
-
.getName() );
-
- private static final String AVALON_CONFIGURABLE_CLASSNAME =
"org.apache.avalon.framework.configuration.Configurable";
-
- private static final String AVALON_CONFIGURATION_CLASSNAME =
"org.apache.avalon.framework.configuration.Configuration";
-
- private static final String AVALON_PARAMETERIZABLE_CLASSNAME =
"org.apache.avalon.framework.parameters.Parameterizable";
-
- private static final String AVALON_PARAMETERS_CLASSNAME =
"org.apache.avalon.framework.parameters.Parameters";
+ private static final Configuration EMPTY_CONFIGURATION;

+ static
+ {
+ REZ = ResourceManager.getPackageResources(
DefaultComponentModel.class );
+ EMPTY_CONFIGURATION = new DefaultConfiguration( "" );
+ }
+
// --------------------------------------------------------------
// immutable state
// --------------------------------------------------------------
@@ -110,8 +100,6 @@

private final DependencyModel[] m_dependencies;

- private final StageModel[] m_stages;
-
private final DefaultState m_assembly =
new DefaultState();

// --------------------------------------------------------------
@@ -138,123 +126,89 @@
* @param context
* the deployment context
*/
- public DefaultComponentModel( ComponentContext context,
- SecurityModel security ) throws ModelException
- {
- super( context, security );
-
- m_context = context;
+ public DefaultComponentModel( ComponentContext context )
+ throws ModelException
+ {
+ super( context );
+ m_context = context;
+ m_activation = getDefaultActivationPolicy();

- m_activation = getDefaultActivationPolicy();
+ setCollectionPolicy(
m_context.getComponentProfile().getCollectionPolicy() );

- setCollectionPolicy( m_context.getComponentProfile()
- .getCollectionPolicy() );
+ ClassLoader classLoader = m_context.getClassLoader();

- ClassLoader classLoader = m_context.getClassLoader();
+ if ( isConfigurable() )
+ {
+ final Configuration defaults =
m_context.getType().getConfiguration();
+ final Configuration explicit =
m_context.getComponentProfile().getConfiguration();
+ final Configuration consolidated = consolidateConfigurations(
explicit, defaults );
+ if ( consolidated != null )
+ {
+ setConfiguration( consolidated );
+ }
+ else
+ {
+ setConfiguration( EMPTY_CONFIGURATION );
+ }
+ }

- if ( isConfigurable() )
+ if ( isParameterizable() )
+ {
+ Parameters staticDefaults = m_context.getType().getParameters();
+ final Parameters parameters =
m_context.getComponentProfile().getParameters();
+ if ( parameters != null )
{
- final Configuration defaults = m_context.getType()
- .getConfiguration();
- final Configuration explicit =
m_context.getComponentProfile()
- .getConfiguration();
- final Configuration consolidated = consolidateConfigurations(
- explicit, defaults );
- if ( consolidated != null )
+ if ( null == staticDefaults )
{
- setConfiguration( consolidated );
+ m_parameters = parameters;
}
else
{
- setConfiguration( EMPTY_CONFIGURATION );
+ m_parameters = new DefaultParameters();
+ m_parameters.merge( staticDefaults );
+ m_parameters.merge( parameters );
}
}
-
- if ( isParameterizable() )
+ else
{
- Parameters staticDefaults =
m_context.getType().getParameters();
- final Parameters parameters = m_context.getComponentProfile()
- .getParameters();
- if ( parameters != null )
+ if ( null == staticDefaults )
{
- if ( null == staticDefaults )
- {
- m_parameters = parameters;
- }
- else
- {
- m_parameters = new DefaultParameters();
- m_parameters.merge( staticDefaults );
- m_parameters.merge( parameters );
- }
+ m_parameters = DefaultParameters.EMPTY_PARAMETERS;
}
else
{
- if ( null == staticDefaults )
- {
- m_parameters = DefaultParameters.EMPTY_PARAMETERS;
- }
- else
- {
- m_parameters = staticDefaults;
- }
+ m_parameters = staticDefaults;
}
}
+ }

- final ContextDescriptor contextDescriptor = m_context.getType()
- .getContext();
- final ContextDirective contextDirective = m_context
- .getComponentProfile().getContext();
- final Logger log = getLogger().getChildLogger( "context" );
- m_contextModel = new DefaultContextModel( log, contextDescriptor,
- contextDirective, context );
-
- //
- // create the dependency models for subsequent assembly
- // management
- //
-
- DependencyDescriptor[] dependencies = m_context.getType()
- .getDependencies();
- m_dependencies = new DefaultDependencyModel[dependencies.length];
-
- for ( int i = 0; i < dependencies.length; i++ )
- {
- DependencyDescriptor descriptor = dependencies[i];
- DependencyDirective directive = context.getComponentProfile()
- .getDependencyDirective( descriptor.getKey() );
- m_dependencies[i] = new DefaultDependencyModel( context
- .getLogger().getChildLogger( "deps" ), context
- .getPartitionName(), context.getProfile().getName(),
- descriptor, directive );
- }
-
- //
- // create the stage models for subsequent assembly
- // management
- //
-
- StageDescriptor[] stages = m_context.getType().getStages();
- m_stages = new DefaultStageModel[stages.length];
-
- for ( int i = 0; i < stages.length; i++ )
- {
- StageDescriptor descriptor = stages[i];
- StageDirective directive = context.getComponentProfile()
- .getStageDirective( descriptor.getKey() );
- m_stages[i] = new DefaultStageModel( context.getLogger()
- .getChildLogger( "stages" ),
- context.getPartitionName(), descriptor, directive );
- }
+ final ContextDescriptor contextDescriptor =
m_context.getType().getContext();
+ final ContextDirective contextDirective =
m_context.getComponentProfile().getContext();
+ final Logger log = getLogger().getChildLogger( "context" );
+ m_contextModel = new DefaultContextModel( log, contextDescriptor,
contextDirective, context );
+
+ //
+ // create the dependency models for subsequent assembly
+ // management
+ //
+
+ DependencyDescriptor[] dependencies =
m_context.getType().getDependencies();
+ m_dependencies = new DefaultDependencyModel[dependencies.length];
+
+ for ( int i = 0; i < dependencies.length; i++ )
+ {
+ DependencyDescriptor descriptor = dependencies[i];
+ DependencyDirective directive =
context.getComponentProfile().getDependencyDirective( descriptor.getKey() );
+ m_dependencies[i] = new DefaultDependencyModel(
context.getLogger().getChildLogger( "deps" ), context.getPartitionName(),
context.getProfile().getName(), descriptor, directive );
}
+ }

/**
* Get the default activation policy for the model.
*/
public boolean getDefaultActivationPolicy()
{
- final int activation = m_context.getComponentProfile()
- .getActivationDirective();
+ final int activation =
m_context.getComponentProfile().getActivationDirective();

if ( activation != DeploymentProfile.DEFAULT )
{
@@ -265,8 +219,7 @@
if ( m_context.getProfile().getMode() == Mode.EXPLICIT )
{
Type type = m_context.getType();
- if ( type.getInfo().getLifestyle().equals(
- InfoDescriptor.TRANSIENT ) )
+ if ( type.getInfo().getLifestyle().equals(
InfoDescriptor.TRANSIENT ) )
{
return false;
}
@@ -300,8 +253,7 @@
}
else
{
- final String error = "Illegal attempt to commission a
non-assembled component model: "
- + this;
+ final String error = "Illegal attempt to commission a
non-assembled component model: " + this;
throw new ModelException( error );
}
}
@@ -317,24 +269,6 @@
*/
public boolean isAssembled()
{
- return ( isStageAssembled() && isServiceAssembled() );
- }
-
- private boolean isStageAssembled()
- {
- StageModel[] stages = getStageModels();
- for ( int i = 0; i < stages.length; i++ )
- {
- if ( null == stages[i].getProvider() )
- {
- return false;
- }
- }
- return true;
- }
-
- private boolean isServiceAssembled()
- {
DependencyModel[] dependencies = getDependencyModels();
for ( int i = 0; i < dependencies.length; i++ )
{
@@ -363,12 +297,6 @@
}

final ArrayList list = new ArrayList();
- StageModel[] stages = getStageModels();
- for ( int i = 0; i < stages.length; i++ )
- {
- StageModel stage = stages[i];
- list.add( stage.getProvider() );
- }
DependencyModel[] dependencies = getDependencyModels();
for ( int i = 0; i < dependencies.length; i++ )
{
@@ -411,19 +339,6 @@
}

/**
- * Return TRUE is this model is capable of supporting a supplied stage
- * dependency.
- *
- * @param stage
- * the stage descriptor
- * @return TRUE if this model can fulfill the stage dependency
- */
- public boolean isaCandidate( StageDescriptor stage )
- {
- return m_context.getType().getExtension( stage ) != null;
- }
-
- /**
* Return TRUE is this model is capable of supporting a supplied service.
*
* @param reference
@@ -576,32 +491,9 @@
*/
public boolean isParameterizable()
{
- if ( getType().getInfo().isNative() )
- {
- return ( Parameterizable.class
- .isAssignableFrom( getDeploymentClass() ) ||
isaConstructorArg( Parameters.class ) );
- }
- else
- {
- try
- {
- ClassLoader loader = m_context.getClassLoader();
- Class parameterizable = loader
- .loadClass( AVALON_PARAMETERIZABLE_CLASSNAME );
- Class parameters = loader
- .loadClass( AVALON_PARAMETERS_CLASSNAME );
- return ( parameterizable
- .isAssignableFrom( getDeploymentClass() ) ||
isaConstructorArg( parameters ) );
- }
- catch ( Throwable e )
- {
- final String error = "The component type " + getType()
- + " is based on the Avalon component model "
- + "however the required classes are not available "
- + "withing the containing classloader.";
- throw new ModelRuntimeException( error, e );
- }
- }
+ boolean isAssignable = Parameterizable.class.isAssignableFrom(
getDeploymentClass() );
+ boolean hasConstructorParameters = isaConstructorArg(
Parameters.class );
+ return ( isAssignable || hasConstructorParameters );
}

/**
@@ -696,30 +588,9 @@
*/
public boolean isConfigurable()
{
- if ( getType().getInfo().isNative() )
- {
- return ( Configurable.class.isAssignableFrom(
getDeploymentClass() ) || isaConstructorArg( Configuration.class ) );
- }
- else
- {
- try
- {
- ClassLoader loader = m_context.getClassLoader();
- Class configurable = loader
- .loadClass( AVALON_CONFIGURABLE_CLASSNAME );
- Class configuration = loader
- .loadClass( AVALON_CONFIGURATION_CLASSNAME );
- return ( configurable.isAssignableFrom( getDeploymentClass()
) || isaConstructorArg( configuration ) );
- }
- catch ( Throwable e )
- {
- final String error = "The component type " + getType()
- + " is based on the Avalon component model "
- + "however the required classes are not available "
- + "withing the containing classloader.";
- throw new ModelRuntimeException( error, e );
- }
- }
+ boolean isAssignable = Configurable.class.isAssignableFrom(
getDeploymentClass() );
+ boolean hasConstructorParameter = isaConstructorArg(
Configuration.class );
+ return isAssignable || hasConstructorParameter;
}

/**
@@ -854,9 +725,8 @@
* Return a dependency model matching the supplied descriptor. If no
model
* matches the supplied descriptor the implementation will return null.
*
- * @param dependency
- * the dependency descriptor
- * @return the matching stage model
+ * @param dependency the dependency descriptor
+ * @return the matching dependency model
*/
public DependencyModel getDependencyModel( DependencyDescriptor
dependency )
{
@@ -873,38 +743,6 @@
}

/**
- * Return the stage models for this component type.
- *
- * @return the stage models
- */
- public StageModel[] getStageModels()
- {
- return m_stages;
- }
-
- /**
- * Return a stage model matching the supplied descriptor. If no stage
model
- * matches the supplied descriptor the implementation will return null.
- *
- * @param stage
- * the stage descriptor
- * @return the matching stage model
- */
- public StageModel getStageModel( StageDescriptor stage )
- {
- StageModel[] stages = getStageModels();
- for ( int i = 0; i < stages.length; i++ )
- {
- StageModel model = stages[i];
- if ( stage.equals( model.getStage() ) )
- {
- return model;
- }
- }
- return null;
- }
-
- /**
* Return the set of services produced by the model as a array of
classes.
*
* @return the service classes
@@ -926,20 +764,6 @@
list.add( getComponentClass( classLoader, classname ) );
}

- //
- // if the component is an extension then add all implemented
- // interfaces
- //
-
- if ( getType().getExtensions().length > 0 )
- {
- Class[] interfaces = getDeploymentClass().getInterfaces();
- for ( int i = 0; i < interfaces.length; i++ )
- {
- list.add( interfaces[i] );
- }
- }
-
return (Class[]) list.toArray( new Class[0] );
}


Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionContext.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionContext.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionContext.java
Sun Jun 12 09:47:29 2005
@@ -33,7 +33,7 @@
/**
* Implementation of a system context that exposes a system wide set of
parameters.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultCompositionContext extends DefaultContext
@@ -58,8 +58,6 @@

private final long m_timeout;

- private final boolean m_secure;
-
private final boolean m_audit;

//--------------------------------------------------------------
@@ -77,12 +75,11 @@
*
* @param system the system context
* @param timeout a system wide default deployment timeout
- * @param secure the security enablement flag
* @param name the logging category name
*/
DefaultCompositionContext(
SystemContext system, ClassLoader api, ClassLoader spi,
- long timeout, boolean secure, boolean audit )
+ long timeout, boolean audit )
throws CompositionException, NullArgumentException
{
super();
@@ -91,19 +88,10 @@

m_timeout = timeout;
m_system = system;
- m_secure = secure;
m_audit = audit;

m_api = api;
m_spi = spi;
-
- if( m_secure )
- {
- if( System.getSecurityManager() == null )
- {
- System.setSecurityManager( new SecurityManager() );
- }
- }
}

//--------------------------------------------------------------
@@ -120,15 +108,6 @@
}

/**
- * Return the enabled status of the code security policy.
- * @return the code security enabled status
- */
- public boolean isCodeSecurityEnabled()
- {
- return m_secure;
- }
-
- /**
* Return true if the audit policy is enabled.
* @return the audit enablement status flag
*/

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionController.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionController.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionController.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@

import net.dpml.composition.model.ContainmentModel;
import net.dpml.composition.model.ModelException;
-import net.dpml.composition.provider.SecurityModel ;
+
import net.dpml.composition.provider.ContainmentContext;
import net.dpml.composition.provider.CompositionException;
import net.dpml.composition.provider.CompositionRuntimeException;
@@ -37,7 +37,7 @@
* Containment model implmentation within which composite models are
aggregated
* as a part of a containment deployment model.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultCompositionController extends DefaultContainmentModel
@@ -86,11 +86,10 @@
// constructor
//--------------------------------------------------------------

- public DefaultCompositionController(
- final CompositionContext composition, final ContainmentContext
context, final SecurityModel security )
- throws ModelException
+ public DefaultCompositionController( CompositionContext composition,
ContainmentContext context )
+ throws ModelException
{
- super( context, security );
+ super( context );

m_composition = composition;
m_state = new State( this );

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionCriteria.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionCriteria.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionCriteria.java
Sun Jun 12 09:47:29 2005
@@ -44,7 +44,7 @@
* The criteria class provides support for the registration of parameters
* for supply to a composition context factory.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
class DefaultCompositionCriteria extends Criteria
@@ -59,10 +59,6 @@
Properties properties = context.getProperties();
return new Parameter[] {
new Parameter(
- SECURITY_ENABLED_KEY,
- Boolean.class,
- getBooleanDefault( properties, SECURITY_ENABLED_KEY, false ) ),
- new Parameter(
AUDIT_ENABLED_KEY,
Boolean.class,
getBooleanDefault( properties, AUDIT_ENABLED_KEY, false ) ),
@@ -128,15 +124,6 @@
//--------------------------------------------------------------

/**
- * Set the security enabled policy
- * @param mode TRUE to enabled security mode else FALSE
- */
- public void setSecurityMode( boolean mode )
- {
- put( SECURITY_ENABLED_KEY, new Boolean( mode ) );
- }
-
- /**
* Set the audit enabled policy
* @param mode TRUE to enabled audit mode else FALSE
*/
@@ -195,15 +182,6 @@
//--------------------------------------------------------------

/**
- * Get the security enabled policy
- * @return TRUE if security is enabled else FALSE
- */
- public Boolean getSecurityMode()
- {
- return (Boolean) get( SECURITY_ENABLED_KEY );
- }
-
- /**
* Get the audit enabled policy
* @return TRUE if audit is enabled else FALSE
*/

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionFactory.java
Sun Jun 12 09:47:29 2005
@@ -65,7 +65,7 @@
/**
* Plugin factory that handles the establishment of a composition context.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultCompositionFactory
@@ -122,10 +122,6 @@
public CompositionCriteria createCompositionCriteria()
{
CompositionCriteria criteria = new DefaultCompositionCriteria(
m_system );
- if( m_line.hasOption( "secure" ) )
- {
- criteria.put( CompositionCriteria.SECURITY_ENABLED_KEY, new
Boolean( true ) );
- }
if( m_line.hasOption( "audit" ) )
{
criteria.put( CompositionCriteria.AUDIT_ENABLED_KEY, new
Boolean( true ) );
@@ -177,7 +173,6 @@
{
CompositionCriteria criteria = buildCompositionCriteria( map );

- boolean secure = getSecurityMode( criteria );
boolean audit = getAuditMode( criteria );
long timeout = getDefaultDeploymentTimeout( criteria );
File dir = m_system.getWorkingDirectory();
@@ -199,7 +194,6 @@
StringBuffer buffer = new StringBuffer( "Composition
Context" );
buffer.append( SystemContext.LINE );
pack( buffer, CompositionCriteria.KERNEL_KEY, kernel );
- pack( buffer, CompositionCriteria.SECURITY_ENABLED_KEY,
secure );
pack( buffer, CompositionCriteria.AUDIT_ENABLED_KEY, audit );
pack( buffer, CompositionCriteria.RUNTIME_ARTIFACT_KEY, uri
);
pack( buffer, CompositionCriteria.DEPLOYMENT_TIMEOUT_KEY,
timeout );
@@ -239,7 +233,7 @@
ClassLoader spi = CompositionContext.class.getClassLoader();

CompositionContext context =
- new DefaultCompositionContext( m_system, api, spi, timeout,
secure, audit );
+ new DefaultCompositionContext( m_system, api, spi, timeout,
audit );
if( getLogger().isDebugEnabled() )
{
getLogger().debug( "composition context established" );
@@ -341,19 +335,6 @@
}
}

- private boolean getSecurityMode( CompositionCriteria criteria )
- {
- Boolean value = criteria.getSecurityMode();
- if( null != value )
- {
- return value.booleanValue();
- }
- else
- {
- return false;
- }
- }
-
private boolean getAuditMode( CompositionCriteria criteria )
{
Boolean value = criteria.getAuditMode();
@@ -468,17 +449,6 @@
Options options = new Options();

//
- // secure switches
- //
-
- OptionGroup security = new OptionGroup();
- security.addOption(
- new Option( "secure", REZ.getString( "cli-secure-description" ) )
);
- security.addOption(
- new Option( "unsecure", REZ.getString( "cli-unsecure-description"
) ) );
- options.addOptionGroup( security );
-
- //
// audit
//


Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultConstructorModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultConstructorModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultConstructorModel.java
Sun Jun 12 09:47:29 2005
@@ -41,7 +41,7 @@
/**
* Default implementation of a the context entry constructor model.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultConstructorModel extends DefaultEntryModel
@@ -246,9 +246,7 @@
* @return the value
* @exception ModelException if the parameter value cannot be resolved
*/
- public Object getValue(
- ClassLoader loader, Class clazz, String argument,
- Parameter[] parameters )
+ public Object getValue( ClassLoader loader, Class clazz, String
argument, Parameter[] parameters )
throws ModelException
{
//
@@ -274,9 +272,8 @@
}
}

- private Object getMultiArgumentConstructorValue(
- ClassLoader classLoader, Class clazz, Parameter[] parameters )
- throws ModelException
+ private Object getMultiArgumentConstructorValue( ClassLoader
classLoader, Class clazz, Parameter[] parameters )
+ throws ModelException
{
//
// getting here means we are dealing with 0..n types parameter
constructor where the
@@ -384,7 +381,7 @@
}

private Object getNullArgumentConstructorValue( Class clazz )
- throws ModelException
+ throws ModelException
{
try
{
@@ -412,9 +409,8 @@
}
}

- private Object getSingleArgumentConstructorValue(
- ClassLoader classLoader, Class clazz, String argument )
- throws ModelException
+ private Object getSingleArgumentConstructorValue( ClassLoader
classLoader, Class clazz, String argument )
+ throws ModelException
{
if ( argument.startsWith( "${" ) )
{
@@ -498,7 +494,8 @@
* @return the parameter class
* @exception ModelException if the parameter class cannot be resolved
*/
- Class getParameterClass( String classname, ClassLoader classLoader )
throws ModelException
+ Class getParameterClass( String classname, ClassLoader classLoader )
+ throws ModelException
{
try
{

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentContext.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentContext.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentContext.java
Sun Jun 12 09:47:29 2005
@@ -44,7 +44,7 @@
/**
* Implementation of a containment supplied to a containment model.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultContainmentContext extends DefaultDeploymentContext

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModel.java
Sun Jun 12 09:47:29 2005
@@ -57,13 +57,11 @@
import net.dpml.composition.model.ModelException;
import net.dpml.composition.model.ModelRepository;
import net.dpml.composition.model.ServiceModel;
-import net.dpml.composition.model.StageModel;
import net.dpml.composition.model.TypeRepository;

import net.dpml.composition.provider.ComponentContext;
import net.dpml.composition.provider.ContainmentContext;
import net.dpml.composition.provider.ModelFactory;
-import net.dpml.composition.provider.SecurityModel;

import net.dpml.configuration.Configuration;
import net.dpml.configuration.impl.DefaultConfigurationBuilder;
@@ -80,7 +78,6 @@
import net.dpml.meta.info.DependencyDescriptor;
import net.dpml.meta.info.ReferenceDescriptor;
import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.StageDescriptor;
import net.dpml.meta.info.Type;

import net.dpml.parameters.Parameters;
@@ -94,7 +91,7 @@
* Containment model implmentation within which composite models are
aggregated
* as a part of a containment deployment model.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultContainmentModel extends DefaultDeploymentModel
@@ -146,11 +143,10 @@
* the structural association of this containment model
* within a parent scope
*/
- public DefaultContainmentModel(
- final ContainmentContext context, final SecurityModel security )
- throws ModelException
+ public DefaultContainmentModel( final ContainmentContext context )
+ throws ModelException
{
- super( context, security );
+ super( context );

m_context = context;

@@ -342,18 +338,6 @@
return false;
}

- /**
- * Return TRUE is this model is capable of supporting a supplied
- * stage dependency. The containment model implementation will
- * allways return FALSE.
- *
- * @return FALSE containers don't export stage handling
- */
- public boolean isaCandidate( StageDescriptor stage )
- {
- return false;
- }
-
/**
* Returns the assembled state of the model.
* @return true if this model is assembled
@@ -442,12 +426,6 @@
private void dissasemble( ComponentModel model )
{
model.getContextModel().setProvider( null );
- StageModel[] stages = model.getStageModels();
- for( int i=0; i<stages.length; i++ )
- {
- StageModel stage = stages[i];
- stage.setProvider( null );
- }
DependencyModel[] dependencies = model.getDependencyModels();
for( int i=0; i<dependencies.length; i++ )
{

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModelAssemblyHelper.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModelAssemblyHelper.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModelAssemblyHelper.java
Sun Jun 12 09:47:29 2005
@@ -34,7 +34,6 @@
import net.dpml.composition.model.ModelSelector;
import net.dpml.composition.model.ProfileSelector;
import net.dpml.composition.model.ProviderNotFoundException;
-import net.dpml.composition.model.StageModel;
import net.dpml.composition.model.TypeRepository;
import net.dpml.composition.model.TypeUnknownException;

@@ -47,14 +46,13 @@

import net.dpml.meta.info.DependencyDescriptor;
import net.dpml.meta.info.ReferenceDescriptor;
-import net.dpml.meta.info.StageDescriptor;
import net.dpml.meta.info.Type;

/**
* A utility class that assists in the location of a model relative
* a supplied path.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
class DefaultContainmentModelAssemblyHelper
@@ -91,37 +89,6 @@
ModelRepository repository = m_context.getModelRepository();

//
- // locate and resolve the stage providers
- //
-
- StageModel[] stages = model.getStageModels();
- for ( int i = 0; i < stages.length; i++ )
- {
- StageModel stage = stages[i];
- if( null == stage.getProvider() )
- {
- try
- {
- subjects.add( model );
- DeploymentModel provider = findExtensionProvider(
- repository, stage, subjects );
- stage.setProvider( provider );
- }
- catch ( Throwable e )
- {
- final String error = "Unable to assemble component: "
- + model
- + " due to a component extension handler
establishment failure.";
- throw new AssemblyException( error, e );
- }
- finally
- {
- subjects.remove( model );
- }
- }
- }
-
- //
// locate and resolve the service providers
//

@@ -328,103 +295,7 @@
}
}

- private DeploymentProfile[] findExtensionProfiles( StageDescriptor stage
)
- {
- TypeRepository repository = m_context.getClassLoaderModel()
- .getTypeRepository();
- Type[] types = repository.getTypes( stage );
- try
- {
- return getProfiles( repository, types );
- }
- catch ( TypeUnknownException tue )
- {
- // will not happen
- final String error = "An irrational condition has occured.";
- throw new ModelRuntimeException( error, tue );
- }
- }
-
- private DeploymentModel findExtensionProvider( ModelRepository
repository,
- StageDescriptor stage, List subjects ) throws AssemblyException
- {
- DeploymentModel[] candidates = repository.getCandidateProviders(
stage );
- ModelSelector selector = new DefaultModelSelector();
- DeploymentModel model = selector.select( candidates, stage );
- if( model != null )
- {
- assembleModel( model, subjects );
- return model;
- }
-
- //
- // otherwise, check for any packaged profiles that
- // we could use to construct the model
- //
-
- DeploymentProfile[] profiles = findExtensionProfiles( stage );
- ProfileSelector profileSelector = new DefaultProfileSelector();
- DeploymentProfile profile = profileSelector.select( profiles, stage
);
- if( profile != null )
- {
- try
- {
- DeploymentModel solution = m_model
- .createDeploymentModel( profile );
- assembleModel( solution, subjects );
- m_model.addModel( solution );
- return solution;
- }
- catch ( AssemblyException ae )
- {
- final String error = "Nested assembly failure while
attempting to construct model"
- + " for the extension profile: ["
- + profile
- + "] for the stage dependency: [" + stage + "].";
- throw new AssemblyException( error, ae );
- }
- catch ( ModelException me )
- {
- final String error = "Nested model failure while attempting
to add model"
- + " for the extension profile: "
- + profile
- + " for the stage dependency: [" + stage + "].";
- throw new AssemblyException( error, me );
- }
- }
- else
- {
- final String error = "Unable to locate a extension provider for
the stage: [ "
- + stage + "].";
- throw new ProviderNotFoundException( error );
- }
- }
-
- private DeploymentModel findExtensionProvider( ModelRepository
repository,
- StageModel stage, List subjects ) throws AssemblyException
- {
- String path = stage.getPath();
- if( null != path )
- {
- DeploymentModel model = m_model.getModel( path );
- if( null == model )
- {
- final String error = "Could not locate a model at the
address: ["
- + path + "] in " + this + ".";
- throw new AssemblyException( error );
- }
- assembleModel( model, subjects );
- return model;
- }
- else
- {
- return findExtensionProvider( repository, stage.getStage(),
- subjects );
- }
- }
-
- private DeploymentProfile[] findServiceProfiles(
- ReferenceDescriptor reference )
+ private DeploymentProfile[] findServiceProfiles( ReferenceDescriptor
reference )
{
TypeRepository repository = m_context.getClassLoaderModel()
.getTypeRepository();

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModelComponentHelper.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModelComponentHelper.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModelComponentHelper.java
Sun Jun 12 09:47:29 2005
@@ -47,7 +47,7 @@
/**
* A utility class that handles creation of a component model context.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
class DefaultContainmentModelComponentHelper

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModelExportHelper.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModelExportHelper.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModelExportHelper.java
Sun Jun 12 09:47:29 2005
@@ -37,7 +37,7 @@
* A utility class that assists in the location of a model relative
* a supplied path.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
class DefaultContainmentModelExportHelper

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModelNavigationHelper.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModelNavigationHelper.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModelNavigationHelper.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@
* A utility class that assists in the location of a model relative
* a supplied path.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
class DefaultContainmentModelNavigationHelper

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContextMap.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContextMap.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContextMap.java
Sun Jun 12 09:47:29 2005
@@ -35,7 +35,7 @@
* Requests for a context entry value are resolved through redirecting
* the request to an assigned model.</p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultContextMap extends HashMap

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContextModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContextModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContextModel.java
Sun Jun 12 09:47:29 2005
@@ -27,6 +27,7 @@
import net.dpml.composition.data.ImportDirective;

import net.dpml.composition.model.ContextModel;
+import net.dpml.composition.model.DeploymentModel;
import net.dpml.composition.model.EntryModel;
import net.dpml.composition.model.ModelException;
import net.dpml.composition.model.ModelRuntimeException;
@@ -48,24 +49,28 @@
* <p>Specification of a context model from which a
* a fully qualifed context can be established.</p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
-public class DefaultContextModel extends DefaultDependent implements
ContextModel
+public class DefaultContextModel
+ implements ContextModel
{
//==============================================================
// static
//==============================================================

- private static final Resources REZ =
- ResourceManager.getPackageResources( DefaultContextModel.class );
+ private static final Resources REZ;

+ static
+ {
+ REZ = ResourceManager.getPackageResources( DefaultContextModel.class
);
+ }
+
public static boolean isaStandardKey( String key )
{
- return (
- key.startsWith( "urn:avalon:" )
- || key.startsWith( "urn:composition:" )
- || key.startsWith( "urn:metro:" ) );
+ boolean isComposition = key.startsWith( "urn:composition:" );
+ boolean isMetro = key.startsWith( "urn:metro:" );
+ return isComposition || isMetro;
}

//==============================================================
@@ -82,8 +87,10 @@

private final Map m_map = new Hashtable();

- //private final DeliveryDescriptor m_delivery;
-
+ private final Logger m_logger;
+
+ private DeploymentModel m_provider;
+
//==============================================================
// constructor
//==============================================================
@@ -107,8 +114,6 @@
ContextDirective directive, ComponentContext context )
throws ModelException, NullArgumentException
{
- super( logger );
-
if( null == descriptor )
{
throw new NullArgumentException( "descriptor" );
@@ -118,7 +123,7 @@
{
throw new NullArgumentException( "context" );
}
-
+ m_logger = logger;
m_descriptor = descriptor;
m_directive = directive;
m_context = context;
@@ -137,8 +142,7 @@
final String key = entry.getKey();
if( isaStandardKey( key ) )
{
- DefaultImportModel model =
- new DefaultImportModel( entry, key, m_context );
+ DefaultImportModel model = new DefaultImportModel( entry,
key, m_context );
setEntryModel( alias, model );
}
else
@@ -149,8 +153,7 @@
// the mechanism for building the context entry
//

- EntryDirective entryDirective =
- directive.getEntryDirective( key );
+ EntryDirective entryDirective = directive.getEntryDirective(
key );
if( null == entryDirective )
{
if( entry.isRequired() )
@@ -178,14 +181,12 @@
ImportDirective importDirective =
(ImportDirective) entryDirective;
String ref = importDirective.getImportKey();
- DefaultImportModel model =
- new DefaultImportModel( entry, ref, m_context );
+ DefaultImportModel model = new DefaultImportModel(
entry, ref, m_context );
setEntryModel( alias, model );
}
else if( entryDirective instanceof ConstructorDirective )
{
- ConstructorDirective constructor =
- (ConstructorDirective) entryDirective;
+ ConstructorDirective constructor =
(ConstructorDirective) entryDirective;
DefaultConstructorModel model =
new DefaultConstructorModel(
entry,
@@ -209,6 +210,16 @@
}
}

+ public DeploymentModel getProvider()
+ {
+ return m_provider;
+ }
+
+ public void setProvider( DeploymentModel provider )
+ {
+ m_provider = provider;
+ }
+
/**
* Return the classname of a custom casting class.
*

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDependencyModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDependencyModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDependencyModel.java
Sun Jun 12 09:47:29 2005
@@ -21,6 +21,7 @@
import java.util.ArrayList;

import net.dpml.composition.model.DependencyModel;
+import net.dpml.composition.model.DeploymentModel;
import net.dpml.composition.model.ModelException;

import net.dpml.composition.data.DependencyDirective;
@@ -39,10 +40,11 @@
/**
* Default implementation of the deplendency model.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
-public class DefaultDependencyModel extends DefaultDependent implements
DependencyModel
+public class DefaultDependencyModel
+ implements DependencyModel
{
//--------------------------------------------------------------
// static
@@ -65,6 +67,11 @@

private final String m_source;

+ private final Logger m_logger;
+
+ private DeploymentModel m_provider;
+
+
//--------------------------------------------------------------
// constructor
//--------------------------------------------------------------
@@ -85,13 +92,11 @@
final DependencyDescriptor descriptor, DependencyDirective
directive )
throws ModelException, NullArgumentException
{
- super( logger );
-
if( descriptor == null )
{
throw new NullArgumentException( "descriptor" );
}
-
+ m_logger = logger;
m_descriptor = descriptor;
m_directive = directive;
m_partition = partition;
@@ -109,9 +114,8 @@
if( directive.getSource() != null )
{
m_source = resolvePath( partition, directive.getSource() );
- final String message =
- REZ.getString( "dependency.path.debug", m_source,
directive.getKey() );
- getLogger().debug( message );
+ final String message = REZ.getString(
"dependency.path.debug", m_source, directive.getKey() );
+ m_logger.debug( message );
}
else
{
@@ -124,6 +128,16 @@
}
}

+ public DeploymentModel getProvider()
+ {
+ return m_provider;
+ }
+
+ public void setProvider( DeploymentModel provider )
+ {
+ m_provider = provider;
+ }
+
//--------------------------------------------------------------
// DependencyModel
//--------------------------------------------------------------
@@ -181,8 +195,7 @@
* @param services the set of candidate services for the dependency
* @return the accepted candidates in ranked order
*/
- private ServiceDescriptor[] filter(
- DependencyDirective directive, ServiceDescriptor[] services )
+ private ServiceDescriptor[] filter( DependencyDirective directive,
ServiceDescriptor[] services )
{
SelectionDirective[] filters = getFilters( directive );
ArrayList list = new ArrayList();
@@ -206,8 +219,7 @@
return candidates;
}

- private boolean isaCandidate(
- ServiceDescriptor service, SelectionDirective[] filters )
+ private boolean isaCandidate( ServiceDescriptor service,
SelectionDirective[] filters )
{
for( int i=0; i<filters.length; i++ )
{
@@ -220,8 +232,7 @@
return true;
}

- private boolean isaCandidate(
- ServiceDescriptor service, SelectionDirective filter )
+ private boolean isaCandidate( ServiceDescriptor service,
SelectionDirective filter )
{
final String feature = filter.getFeature();
final String value = filter.getValue();

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDeploymentContext.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDeploymentContext.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDeploymentContext.java
Sun Jun 12 09:47:29 2005
@@ -37,7 +37,7 @@
/**
* Default implementation of a deployment context.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultDeploymentContext extends DefaultContext

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDeploymentModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDeploymentModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDeploymentModel.java
Sun Jun 12 09:47:29 2005
@@ -18,17 +18,12 @@

package net.dpml.composition.model.impl;

-import java.security.AccessControlContext;
-import java.security.Permissions;
-import java.security.ProtectionDomain;
-
import net.dpml.composition.data.Mode;

import net.dpml.composition.model.Commissionable;
import net.dpml.composition.model.DeploymentModel;

import net.dpml.composition.provider.DeploymentContext;
-import net.dpml.composition.provider.SecurityModel;

import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;
@@ -45,7 +40,7 @@
/**
* Abstract model base class.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public abstract class DefaultDeploymentModel
@@ -64,10 +59,6 @@

private final DeploymentContext m_context;

- private final SecurityModel m_security;
-
- private final AccessControlContext m_access;
-
//--------------------------------------------------------------
// muttable state
//--------------------------------------------------------------
@@ -87,32 +78,20 @@
* name and a partition.
*
* @param context the deployment context
- * @exception NullArgumentException if either the context argument or the
security
- * argument is null.
+ * @exception NullArgumentException if either the context argument
*/
- public DefaultDeploymentModel( DeploymentContext context, SecurityModel
security )
+ public DefaultDeploymentModel( DeploymentContext context )
throws NullArgumentException
{
if( null == context )
{
throw new NullArgumentException( "context" );
}
- if( null == security )
- {
- throw new NullArgumentException( "security" );
- }

m_context = context;
- m_security = security;

m_logger = m_context.getLogger();
m_categories = m_context.getProfile().getCategories();
-
- Permissions permissions = security.getPermissions();
- ProtectionDomain domain =
- new ProtectionDomain( null, permissions );
- ProtectionDomain[] domains = new ProtectionDomain[]{ domain };
- m_access = new AccessControlContext( domains );
}

//--------------------------------------------------------------
@@ -247,33 +226,6 @@
return m_logger;
}

- /**
- * Return the assigned permissions.
- * @return the permissions
- */
- public Permissions getPermissions()
- {
- return m_security.getPermissions();
- }
-
- /**
- * Return the access control context.
- * @return the access control context
- */
- public AccessControlContext getAccessControlContext()
- {
- return m_access;
- }
-
- /**
- * Return the enabled status of the code security policy.
- * @return the code security enabled status
- */
- public boolean isCodeSecurityEnabled()
- {
- return m_security.isEnabled();
- }
-
//--------------------------------------------------------------
// implementation
//--------------------------------------------------------------

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultEntryModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultEntryModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultEntryModel.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
/**
* Abstract implementation of a the context entry model.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public abstract class DefaultEntryModel implements EntryModel

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultFilesetModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultFilesetModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultFilesetModel.java
Sun Jun 12 09:47:29 2005
@@ -35,7 +35,7 @@
* to resolve and build a set of files specified by a
* <code>FilesetDirective</code>.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultFilesetModel

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultImportModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultImportModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultImportModel.java
Sun Jun 12 09:47:29 2005
@@ -36,7 +36,7 @@
/**
* Default implementation of a the context entry import model.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultImportModel extends DefaultEntryModel
@@ -130,10 +130,6 @@
{
return getStandardMetroEntry( key );
}
- if( key.startsWith( "urn:avalon:" ) )
- {
- return getStandardAvalonEntry( key );
- }
else if( key.startsWith( "urn:composition:" ) )
{
return getStandardCompositionEntry( key );
@@ -171,31 +167,6 @@
return null;
}

- private Object getStandardAvalonEntry( String key )
- {
- if( key.equals( "urn:avalon:name" ) )
- {
- return m_context.getName();
- }
- else if( key.equals( "urn:avalon:partition" ) )
- {
- return m_context.getPartitionName();
- }
- else if( key.equals( "urn:avalon:classloader" ) )
- {
- return m_context.getClassLoader();
- }
- else if( key.equals( "urn:avalon:home" ) )
- {
- return m_context.getWorkingDirectory();
- }
- else if( key.equals( "urn:avalon:temp" ) )
- {
- return m_context.getTempDirectory();
- }
- return null;
- }
-
private Object getStandardCompositionEntry( String key )
{
if( key.equals( ContainmentModel.KEY ) )

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultModelFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultModelFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultModelFactory.java
Sun Jun 12 09:47:29 2005
@@ -32,11 +32,9 @@

import net.dpml.composition.data.ClassLoaderDirective;
import net.dpml.composition.data.ContainmentProfile;
-import net.dpml.composition.data.SecurityProfile;

import net.dpml.composition.data.builder.ContainmentProfileBuilder;
import net.dpml.composition.data.builder.XMLContainmentProfileCreator;
-import net.dpml.composition.data.builder.XMLSecurityProfileBuilder;

import net.dpml.composition.model.ClassLoaderModel;
import net.dpml.composition.model.ComponentModel;
@@ -52,7 +50,6 @@
import net.dpml.composition.provider.ContainmentContext;
import net.dpml.composition.provider.ModelFactory;
import net.dpml.composition.provider.Runtime;
-import net.dpml.composition.provider.SecurityModel;

import net.dpml.configuration.Configuration;

@@ -76,7 +73,7 @@
/**
* A factory enabling the establishment of new composition model instances.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultModelFactory
@@ -95,19 +92,8 @@
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultModelFactory.class );

- private static final SecurityModel NULL_SECURITY =
- new DefaultSecurityModel();
-
private static final String DEFAULT_PROFILE_NAME = "default";

- private static final XMLSecurityProfileBuilder SECURITY_BUILDER =
- new XMLSecurityProfileBuilder();
-
- private static final String AVALON_API =
- "artifact:jar:avalon-framework/avalon-framework-api#4.2.0";
- private static final String AVALON_LIFECYCLE_API =
- "artifact:jar:avalon/util/avalon-util-lifecycle#1.1.1";
-
//-------------------------------------------------------------------
// immutable state
//-------------------------------------------------------------------
@@ -117,11 +103,6 @@
private final Logger m_logger;

/**
- * A map of security models keyed by profile name.
- */
- private final Map m_security = new Hashtable();
-
- /**
* A table of protection domain instances keyed by code source.
* (not used yet)
*/
@@ -142,11 +123,6 @@
*/
private final ContainmentModel m_root;

- /**
- * A table of permissions instances keyed by code source.
- */
- private Map m_permissions = new Hashtable();
-
//-------------------------------------------------------------------
// constructor
//-------------------------------------------------------------------
@@ -155,9 +131,6 @@
* Creation of a new model factory.
*
* @param context the composition context
- * @param profiles the set of initial security profiles
- * @param grants the set of initial address to permission
- * profile assignments
* @param artifact the runtime artifact
*/
DefaultModelFactory( final CompositionContext context, URI uri,
@@ -177,64 +150,6 @@

m_logger = context.getSystemContext().getLogger();
Configuration config = getKernelConfiguration( kernel );
- Configuration secConfig = config.getChild( "security" );
- SecurityProfile[] profiles = getSecurityProfiles( secConfig );
-
- //
- // register the security profiles
- //
-
- if( context.isCodeSecurityEnabled() )
- {
- for( int i=0; i<profiles.length; i++ )
- {
- SecurityProfile profile = profiles[i];
- final String name = profile.getName();
- if( m_logger.isDebugEnabled() )
- {
- m_logger.debug(
- "adding security profile [" + name + "]." );
- }
- try
- {
- SecurityModel model = new DefaultSecurityModel( profile,
true );
- m_security.put( profile.getName(), model );
- }
- catch( Throwable e )
- {
- final String error =
- "Cannot include initial security model [" + name +
"].";
- throw new ModelRuntimeException( error, e );
- }
- }
-
- //
- // check that we have a default security profile
- //
-
- if( null == m_security.get( DEFAULT_PROFILE_NAME ) )
- {
- final String error =
- "Security enabled without a \""
- + DEFAULT_PROFILE_NAME
- + "\" profile.";
- throw new IllegalStateException( error );
- }
-
- //
- // check that the initial set of grant bindings actually
- // refer to known security profiles
- //
-
- Set entries = m_grants.entrySet();
- Iterator iterator = entries.iterator();
- while( iterator.hasNext() )
- {
- Map.Entry entry = (Map.Entry) iterator.next();
- final String profile = (String) entry.getValue();
- getNamedSecurityModel( profile );
- }
- }

m_runtime = createRuntime( context.getSystemContext(), uri );

@@ -284,21 +199,6 @@
}
}

- private SecurityProfile[] getSecurityProfiles( Configuration config )
throws CompositionException
- {
- try
- {
- return SECURITY_BUILDER.createSecurityProfiles( config );
- }
- catch( Throwable e )
- {
- final String error =
- "Unable to construct security profiles.";
- throw new CompositionException( error, e );
- }
- }
-
-
//-------------------------------------------------------------------
// ModelFactory
//-------------------------------------------------------------------
@@ -326,8 +226,7 @@
throws ModelException
{
final String path = context.getQualifiedName();
- SecurityModel security = getAssignedSecurityModel( path );
- return new DefaultComponentModel( context, security );
+ return new DefaultComponentModel( context );
}

/**
@@ -441,14 +340,13 @@
throws ModelException
{
final String path = context.getQualifiedName();
- SecurityModel security = getAssignedSecurityModel( path );
if( root )
{
- return new DefaultCompositionController( m_context, context,
security );
+ return new DefaultCompositionController( m_context, context );
}
else
{
- return new DefaultContainmentModel( context, security );
+ return new DefaultContainmentModel( context );
}
}

@@ -514,74 +412,6 @@
}

/**
- * Return the security profile matching the supplied deployment
- * path. The implementation will return the default security profile
- * unless an explicit grant has been declared for the the supplied
- * path, and the grant referes to a known security profile.
- *
- * @param path the container or component path
- * @return the assigned security model
- */
- private SecurityModel getAssignedSecurityModel( final String path )
- {
- if( m_context.isCodeSecurityEnabled() )
- {
- final String profile = getAssignedProfileName( path );
- return getNamedSecurityModel( profile );
- }
- else
- {
- return NULL_SECURITY;
- }
- }
-
- /**
- * Return a named security profile.
- * @param name an existing security profile name
- * @return the security model
- * @exception IllegalArgumentException if the name is unknown
- */
- private SecurityModel getNamedSecurityModel( String name )
- {
- SecurityModel model =
- (SecurityModel) m_security.get( name );
- if( null != model )
- {
- return model;
- }
- else
- {
- final String error =
- "Unknown security profile [" + name + "].";
- throw new IllegalArgumentException( error );
- }
- }
-
- /**
- * Return the security profile name assigned to the supplied path.
- * If no assignment has been declared the default security profile
- * name will be returned.
- *
- * @return the security profile name for the path
- */
- private String getAssignedProfileName( String path )
- {
- final String profile = (String) m_grants.get( path );
- if( null != profile ) return profile;
- return DEFAULT_PROFILE_NAME;
- }
-
- /**
- * Return the default security model.
- *
- * @return the default security model
- */
- private SecurityModel getDefaultSecurityModel()
- {
- return (SecurityModel) m_security.get( DEFAULT_PROFILE_NAME );
- }
-
- /**
* Create the kernel configuration using a supplied url. If the supplied
* url is null the implementation will attempt to resolve a "/kernel.xml"
* resource within the deployment unit.
@@ -683,7 +513,6 @@
/**
* Null runtime runtime services.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital
Product Meta Library</a>
* @version $Id$
*/
private class NullRuntime implements Runtime

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultModelRepository.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultModelRepository.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultModelRepository.java
Sun Jun 12 09:47:29 2005
@@ -31,15 +31,14 @@

import net.dpml.meta.info.DependencyDescriptor;
import net.dpml.meta.info.ReferenceDescriptor;
-import net.dpml.meta.info.StageDescriptor;


/**
* The model repository interface declares operations through which
* clients may resolve registered model instances relative to
- * a stage or service dependencies.
+ * a service dependency.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultModelRepository
@@ -122,43 +121,12 @@
}

/**
- * Locate all models meeting the supplied criteria.
- *
- * @param stage a component stage dependency
- * @return the candidate models
- */
- public DeploymentModel[] getCandidateProviders( StageDescriptor stage )
- {
- ArrayList list = new ArrayList();
- Iterator iterator = m_models.values().iterator();
- while( iterator.hasNext() )
- {
- DeploymentModel model = (DeploymentModel) iterator.next();
- if( model.isaCandidate( stage ) )
- {
- list.add( model );
- }
- }
-
- if( m_parent != null )
- {
- DeploymentModel[] models = m_parent.getCandidateProviders( stage
);
- for( int i=0; i<models.length; i++ )
- {
- list.add( models[i] );
- }
- }
- return (DeploymentModel[]) list.toArray( new DeploymentModel[0] );
- }
-
- /**
* Locate all models meeting the supplied dependency criteria.
*
* @param dependency a component service dependency
* @return the candidate models
*/
- public DeploymentModel[] getCandidateProviders(
- DependencyDescriptor dependency )
+ public DeploymentModel[] getCandidateProviders( DependencyDescriptor
dependency )
{
ArrayList list = new ArrayList();
Iterator iterator = m_models.values().iterator();
@@ -213,33 +181,6 @@
return (DeploymentModel[]) list.toArray( new DeploymentModel[0] );
}

- /**
- * Locate a model meeting the supplied criteria.
- *
- * @param stage a component stage dependency
- * @return the model
- */
- public DeploymentModel getModel( StageDescriptor stage )
- {
- Iterator iterator = m_models.values().iterator();
- while( iterator.hasNext() )
- {
- DeploymentModel model = (DeploymentModel) iterator.next();
-
- if( model.isaCandidate( stage ) )
- {
- return model;
- }
- }
-
- if( m_parent != null )
- {
- return m_parent.getModel( stage );
- }
-
- return null;
- }
-
//------------------------------------------------------------------
// implementation
//------------------------------------------------------------------
@@ -250,7 +191,7 @@
* @param model the model to add
*/
public void addModel( DeploymentModel model )
- throws DuplicateNameException
+ throws DuplicateNameException
{
final String name = model.getName();
addModel( name, model );
@@ -263,7 +204,7 @@
* @param model the model to add
*/
public void addModel( String name, DeploymentModel model )
- throws DuplicateNameException
+ throws DuplicateNameException
{
if( null != m_models.get( name ) )
{

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultModelSelector.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultModelSelector.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultModelSelector.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,6 @@

import net.dpml.meta.info.DependencyDescriptor;
import net.dpml.meta.info.ReferenceDescriptor;
-import net.dpml.meta.info.StageDescriptor;


/**
@@ -35,7 +34,7 @@
* status. For each category, if a supplied profile matches the category
* the first profile matching the category is returned.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
class DefaultModelSelector implements ModelSelector
@@ -62,19 +61,6 @@
/**
* Returns the preferred model from an available selection of candidates
* @param models the set of candidate models
- * @param stage the stage dependency
- * @return the preferred provider or null if no satisfactory
- * provider can be established
- */
- public DeploymentModel select( DeploymentModel[] models, StageDescriptor
stage )
- {
- DeploymentModel[] candidates = filterCandidateProviders( models,
stage );
- return select( candidates );
- }
-
- /**
- * Returns the preferred model from an available selection of candidates
- * @param models the set of candidate models
* @param reference the versioned service reference
* @return the preferred provider or null if no satisfactory provider
* can be established
@@ -120,21 +106,6 @@
return (DeploymentModel[]) list.toArray( new DeploymentModel[0] );
}

- private DeploymentModel[] filterCandidateProviders(
- DeploymentModel[] models, StageDescriptor stage )
- {
- ArrayList list = new ArrayList();
- for( int i = 0; i < models.length; i++ )
- {
- DeploymentModel model = models[i];
- if( model.isaCandidate( stage ) )
- {
- list.add( model );
- }
- }
- return (DeploymentModel[]) list.toArray( new DeploymentModel[0] );
- }
-
/**
* Select a model from a set of models based on a priority ordering
* of EXPLICIT, PACKAGE and lastly IMPLICIT. If multiple candidates

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultProfileSelector.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultProfileSelector.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultProfileSelector.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,6 @@
import net.dpml.composition.model.ProfileSelector;

import net.dpml.meta.info.DependencyDescriptor;
-import net.dpml.meta.info.StageDescriptor;
import net.dpml.meta.info.ReferenceDescriptor;

/**
@@ -32,7 +31,7 @@
* status. For each category, if a supplied profile matches the category
* the first profile matching the category is returned.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
class DefaultProfileSelector implements ProfileSelector
@@ -60,20 +59,6 @@
* candidates profiles.
*
* @param profiles the set of candidate profiles
- * @param dependency a stage dependency
- * @return the preferred extension provider profile or null if
- * no satisfactory profile can be established
- */
- public DeploymentProfile select( DeploymentProfile[] profiles,
StageDescriptor stage )
- {
- return select( profiles );
- }
-
- /**
- * Returns the preferred profile from an available selection of
- * candidates profiles.
- *
- * @param profiles the set of candidate profiles
* @param reference a service reference
* @return the preferred profile or null if
* no satisfactory profile can be established

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultServiceModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultServiceModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultServiceModel.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
/**
* Service model exposes an exported service class.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultServiceModel implements ServiceModel

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultServiceRepository.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultServiceRepository.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultServiceRepository.java
Sun Jun 12 09:47:29 2005
@@ -36,7 +36,7 @@
* A service repository provides support for the retrival
* of service defintions.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultServiceRepository implements ServiceRepository

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultState.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultState.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultState.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* The State class desribes a enabled versus disabled state.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: DefaultState.java 187 2004-10-23 17:10:53Z niclas $
*/


Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultTypeRepository.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultTypeRepository.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DefaultTypeRepository.java
Sun Jun 12 09:47:29 2005
@@ -43,7 +43,6 @@

import net.dpml.meta.info.DependencyDescriptor;
import net.dpml.meta.info.ReferenceDescriptor;
-import net.dpml.meta.info.StageDescriptor;
import net.dpml.meta.info.Type;


@@ -51,7 +50,7 @@
* A type manager implementation provides support for the creation,
* storage and retrival of component types.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
class DefaultTypeRepository implements TypeRepository
@@ -344,43 +343,6 @@
}


- /**
- * Locate the set of local component types that provide the
- * supplied extension.
- * @param stage a stage descriptor
- * @return a set of types that support the supplied stage
- */
- public Type[] getTypes( StageDescriptor stage )
- throws NullArgumentException
- {
- if( stage == null )
- {
- throw new NullArgumentException( "stage" );
- }
-
- ArrayList list = new ArrayList();
- Type[] types = getTypes( false );
- for( int i=0; i<types.length; i++ )
- {
- Type type = types[i];
- if( type.getExtension( stage ) != null )
- {
- list.add( type );
- }
- }
-
- if( m_parent != null )
- {
- Type[] suppliment = m_parent.getTypes( stage );
- for( int i=0; i<suppliment.length; i++ )
- {
- list.add( suppliment[i] );
- }
- }
-
- return (Type[]) list.toArray( new Type[0] );
- }
-
/**
* Return the set of deployment profiles for the supplied type. An
* implementation is required to return a array of types > 0 in length

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DirectoryScanner.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DirectoryScanner.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/DirectoryScanner.java
Sun Jun 12 09:47:29 2005
@@ -37,8 +37,7 @@
/**
* TODO Write class description.
*
- * @author Apache Ant Development Team (Kuiper, Umasankar, Atherton, and
Levy-Lambert)
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DirectoryScanner {

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/OverrideEntryModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/OverrideEntryModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/OverrideEntryModel.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
* Utility class that enables assignment of an absolute value to a
* context entry.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class OverrideEntryModel extends DefaultEntryModel

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/Resource.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/Resource.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/Resource.java
Sun Jun 12 09:47:29 2005
@@ -25,8 +25,7 @@
* and date/time information about a file, a zip entry or some similar
* resource (URL, archive in a version control repository, ...)
*
- * @author Apache Ant Development Team (Levy-Lamber)
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class Resource {

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/Resources.properties
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/Resources.properties
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/Resources.properties
Sun Jun 12 09:47:29 2005
@@ -4,7 +4,6 @@
# =========================

cli-secure-description=Enables secure execution (experimental).
-cli-unsecure-description=Disables security (default).
cli-runtime-description=A runtime artifact specification.
cli-timeout-description=Sets the default timeout value (in miliseconds).
cli-kernel-description=The path to the kernel defintion.
@@ -20,8 +19,6 @@

# DefaultClassLoaderModel
# =======================
-classloader.unsatisfied-extensions.error=Classpath contains {0} unsatisfied
extension dependencies.
-classloader.missing.extension.error=Unable to locate a required extension.\n
Extension Name: {0}\n Specification Vendor: {1}\n Specification Version:
{2}\n Implementation Vendor: {3}\n Implementation Vendor-Id: {4}\n
Implementation Version: {5}\n Implementation URL: {6}
classloader.bad-classpath-entry.error=Cannot load manifest from classpath
reference: {0}.
classloader.child.creation.error=Internal error while attempt to construct a
child classloader model for containment profile: {0}.

@@ -47,20 +44,15 @@
deployment.context.home.not-a-directory.error=Supplied home dir is not a
directory: {0}
deployment.context.temp.not-a-directory.error=Supplied temp dir is not a
directory: {0}
deployment.context.runtime-get="Unable to resolve context value for key {0}
due to an unexpected runtime error in: " {1}
-deployment.inconsitent-strategy.error=The custom contextualization strategy
interface class [{0}] is not implemented by the component class [{1}].
-deployment.missing-strategy.error=The custom contextualization strategy
interface class [{0}] declared by the class [{1}] is not present in the
containment context classloader.
deployment.context.invalid-key-request=The requested context resolution for
the key [{0}] cannot be performed because the component type does declare an
entry declaration as a key or alias.
deployment.context.internal.error=The context key [{0}] was recognized but
could not be fulfilled as no context entry manager has be assigned to handle
the request.
deployment.registration.override.error=Illegal attempt to override an
existing model entry [{0}].

-assembly.context.error=Assembly of the model [{0}] could not be completed
due to an unresolvable custom contextualization stage dependency for the
interface [{1}].
assembly.dependency.error=Assembly of the model [{0}] could not be completed
due to an unresolvable service dependency for the key [{1}].
-assembly.stage.error=Assembly of the model [{0}] could not be completed due
to an unresolvable stage dependency for the key [{1}].
assembly.transitional.error=Illegal attempt to assemble [{0}] while the the
model is in a state of transition.
assembly.reassembly.error=Illegal attempt to re-assemble the model [{0}].
assembly.dissassembly.transitional.error=Illegal attempt to dissassemble
[{0}] while the model is in a state of transition.
assembly.dissassembly.state.error=Illegal attempt to dissassemble a
dissassembled model [{0}].
-assembly.context-strategy.bad-class.error=Context strategy handler class
[{0}] does not implement the
org.apache.avalon.activation.lifecycle.ContextualizationHandler interface
defined in the container classloader.


# DefaultSystemContext
@@ -100,8 +92,6 @@
scanner.not-file-protocol.error=URL protocol does not match the required
'file' protocol: {0}
scanner.type.missing-class.error=Cannot load component type because the type
class {0} does not exist in the classloader.
scanner.type.bad-class.error=Component type [{0}] contains a reference to
the class [{1}] which does not exist in the classloader.
-scanner.extension.bad-class.error=Cannot load component type [{0}] because
the type declares an extension class [{1}] which cannot be loaded due to a
missing class [{2}].
-scanner.extension.missing.error=Cannot load component type [{0}] contains
because the extension class it declares [{1}] does not exist in the
classloader.
scanner.type.verification.ncdf.failure=Ignoring component type [{0}] as the
implementation class contains a reference to the class [{1}] which does not
exist in the classloader.

# DefaultImportModel
@@ -114,9 +104,9 @@
#DefaultContextModel
# ==================
context.strategy.custom=custom strategy: {0}
-context.strategy.avalon=avalon strategy
+context.strategy.metro=metro strategy
context.non-standard-key.error=The component has requested a context entry
that is not know within the family of standard context keys. The offending
key is: {0}.
-context.non-standard-avalon-key.error=The component has requested a Avalon
context entry that is not know within the family of standard Avalon context
keys. The offending key is: {0}.
+context.non-standard-metro-key.error=The component has requested a Metro
context entry that is not know within the family of standard context keys.
The offending key is: {0}.
context.non-standard-system-key.error=The component has requested a system
context entry that is not know within the family of standard context keys.
The offending key is: {0}.
context.unknown-system-key.error=The component has requested a system
context entry that is not know within the family of standard Merlin context
keys. The offending key is: {0}.
context.missing-directive.error=The component has requested a non-standard
context entry. The container cannot resolve this request because no entry
directive can be found the matches the key: {0}.
@@ -125,8 +115,8 @@
context.custom-unexpected.error=Unexpected error occured while attempting to
construct a custom context using the class [{0}].
context.strategy.custom.missing.error=Custom stategy class [{0}] is not
present in the classpath.
context.strategy.custom.unexpected.error=Unable to load the custom stategy
class [{0}] due to an unexpected error.
-context.strategy.avalon.missing.error=Classic Avalon context stategy class
[{0}] is not present in the classpath.
-context.strategy.avalon.unexpected.error=Unable to load the classic Avalon
stategy class [{0}] due to an unexpected error.
+context.strategy.metro.missing.error=Classic context stategy class [{0}] is
not present in the classpath.
+context.strategy.metro.unexpected.error=Unable to load the classic stategy
class [{0}] due to an unexpected error.

# DefaultContext
# ==============

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/Scanner.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/Scanner.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/Scanner.java
Sun Jun 12 09:47:29 2005
@@ -59,7 +59,7 @@
/**
* A repository for services, types and profiles.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
class Scanner
@@ -481,9 +481,8 @@

/**
* Return the set of interface classes for a given type that are declared
- * or default to the "native" service access protocol and where the
- * service access model is undefined (i.e. native implementation).
- * access mode.
+ * or default to the service access protocol and where the
+ * service access model is undefined.
*
* @param type the component type
* @return an array of classes represnting the type's service interfaces
@@ -496,10 +495,8 @@
for( int i = 0; i < services.length; i++ )
{
ServiceDescriptor service = services[i];
- if( (service.getAttribute(
- "urn:avalon:service.protocol", "native" ).equals( "native" ))
- && ( service.getAttribute(
- "urn:avalon:service.accessor", null ) == null) )
+ String serviceAccess = service.getAttribute(
"urn:metro:service.accessor", null );
+ if( serviceAccess == null )
{
list.add( getServiceClass( services[i] ) );
}

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/ScannerUtils.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/ScannerUtils.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/ScannerUtils.java
Sun Jun 12 09:47:29 2005
@@ -26,8 +26,7 @@
* <p>This is a utility class used by DirectoryScanner.</p>
* <p>This is a Singleton.</p>
*
- * @author Apache Ant Development Team (Kuiper, Umasankar, Atherton)
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ScannerUtils {

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/SimpleFIFO.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/SimpleFIFO.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/model/impl/SimpleFIFO.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
*
* It is not intended to be used outside this package,
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
class SimpleFIFO

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/util/FileUtils.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/util/FileUtils.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/util/FileUtils.java
Sun Jun 12 09:47:29 2005
@@ -29,8 +29,7 @@
* composition implementation, and is borrowed from the Apache
* Ant development team.
*
- * @author Apache Ant Development Team (MacNeill, Umasankar, and Bodewig)
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class FileUtils {

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/util/Resource.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/util/Resource.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/util/Resource.java
Sun Jun 12 09:47:29 2005
@@ -25,8 +25,7 @@
* and date/time information about a file, a zip entry or some similar
* resource (URL, archive in a version control repository, ...)
*
- * @author Apache Ant Development Team (Levy-Lamber)
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class Resource

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/util/ScannerUtils.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/util/ScannerUtils.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/main/net/dpml/composition/util/ScannerUtils.java
Sun Jun 12 09:47:29 2005
@@ -27,8 +27,7 @@
* <p>This is a utility class used by DirectoryScanner.</p>
* <p>This is a Singleton.</p>
*
- * @author Apache Ant Development Team (Kuiper, Umasankar, Atherton)
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ScannerUtils {

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/test/net/dpml/composition/model/builder/ContentHandlerTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/test/net/dpml/composition/model/builder/ContentHandlerTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/test/net/dpml/composition/model/builder/ContentHandlerTestCase.java
Sun Jun 12 09:47:29 2005
@@ -75,7 +75,7 @@
/**
* Stream handler factory assigned to a classloader.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital
Product Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: LoggingManagerHelper.java 506 2004-11-08 20:10:07Z
mcconnell $
*/
public static class ArtifactURLStreamHandlerFactory

Modified:
development/laboratory/users/niclas/osgi/composition/impl/src/test/net/dpml/composition/model/impl/SimpleDeploymentModel.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/impl/src/test/net/dpml/composition/model/impl/SimpleDeploymentModel.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/impl/src/test/net/dpml/composition/model/impl/SimpleDeploymentModel.java
Sun Jun 12 09:47:29 2005
@@ -20,8 +20,6 @@

import java.util.List;

-import java.security.AccessControlContext;
-
import net.dpml.composition.data.Mode;

import net.dpml.composition.model.DeploymentModel;
@@ -31,7 +29,6 @@
import net.dpml.meta.info.DependencyDescriptor;
import net.dpml.meta.info.ServiceDescriptor;
import net.dpml.meta.info.ReferenceDescriptor;
-import net.dpml.meta.info.StageDescriptor;

import net.dpml.logging.Logger;

@@ -114,16 +111,6 @@
{
}

- public AccessControlContext getAccessControlContext()
- {
- return null;
- }
-
- public boolean isCodeSecurityEnabled()
- {
- return m_secure;
- }
-
//-----------------------------------------------------------
// service production
//-----------------------------------------------------------
@@ -149,16 +136,6 @@

/**
* Return TRUE is this model is capable of supporting a supplied
- * stage dependency.
- * @return true if this model can fulfill the dependency
- */
- public boolean isaCandidate( StageDescriptor stage )
- {
- return true;
- }
-
- /**
- * Return TRUE is this model is capable of supporting a supplied
* service.
* @return true if this model can fulfill the service
*/

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/data/builder/ContainmentProfileCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/data/builder/ContainmentProfileCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/data/builder/ContainmentProfileCreator.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
* Simple interface used to create a {@link ContainmentProfile}
* from an input stream.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ContainmentProfileCreator

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/data/builder/ProfilePackageCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/data/builder/ProfilePackageCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/data/builder/ProfilePackageCreator.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
* Interface used to create a {@link ProfilePackage}
* from an input stream.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ProfilePackageCreator

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/data/builder/TargetsCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/data/builder/TargetsCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/data/builder/TargetsCreator.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
* Simple interface used to create a {@link Targets}
* from an input stream.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface TargetsCreator

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/data/writer/ContainmentProfileWriter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/data/writer/ContainmentProfileWriter.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/data/writer/ContainmentProfileWriter.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
* Interface implemented by objects supporting the writing
* of a {@link ContainmentProfile} to an output stream.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ContainmentProfileWriter

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/ClassLoaderContext.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/ClassLoaderContext.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/ClassLoaderContext.java
Sun Jun 12 09:47:29 2005
@@ -26,9 +26,6 @@
import net.dpml.composition.model.TypeRepository;
import net.dpml.composition.model.ServiceRepository;

-import net.dpml.extension.manager.OptionalPackage;
-import net.dpml.extension.manager.ExtensionManager;
-
import net.dpml.context.Context;
import net.dpml.logging.Logger;

@@ -37,7 +34,7 @@
/**
* Defintion of a working context.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ClassLoaderContext extends Context
@@ -74,22 +71,6 @@
ClassLoader getClassLoader();

/**
- * Return the optional packages already establised relative to
- * the parent classloader.
- *
- * @return the array of established optional packages
- */
- OptionalPackage[] getOptionalPackages();
-
- /**
- * Return the extension manager established by the parent
- * classloader model.
- *
- * @return the extension manager
- */
- ExtensionManager getExtensionManager();
-
- /**
* Return the classloader directive to be applied to the
* classloader model.
*

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/ComponentContext.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/ComponentContext.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/ComponentContext.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@
/**
* Defintion of a component deployment context.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ComponentContext extends DeploymentContext

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionContext.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionContext.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionContext.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
/**
* Defintion of a system context that exposes a system wide set of
parameters.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface CompositionContext extends Context
@@ -57,12 +57,6 @@
long getDefaultDeploymentTimeout();

/**
- * Return the enabled status of the code security policy.
- * @return the code security enabled status
- */
- boolean isCodeSecurityEnabled();
-
- /**
* Return the enabled status of the audit policy.
* @return TRUE if audit enabled
*/

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionCriteria.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionCriteria.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionCriteria.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@
* a set of operations that enable easy manipulation of the composition
* context parameters.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface CompositionCriteria extends Map
@@ -39,22 +39,11 @@
// criteria keys
//--------------------------------------------------------------

- /**
- * The security enabled policy key.
- */
String GROUP = SystemContext.DOMAIN + ".composition";

- /**
- * The security enabled policy key.
- */
String AUDIT_ENABLED_KEY = GROUP + ".audit";

/**
- * The security enabled policy key.
- */
- String SECURITY_ENABLED_KEY = GROUP + ".secure";
-
- /**
* The activation runtime artifact key.
*/
String RUNTIME_ARTIFACT_KEY = GROUP + ".runtime";
@@ -81,7 +70,7 @@

String[] KEYS =
new String[]{
- SECURITY_ENABLED_KEY, AUDIT_ENABLED_KEY,
+ AUDIT_ENABLED_KEY,
RUNTIME_ARTIFACT_KEY, DEPLOYMENT_TIMEOUT_KEY, KERNEL_KEY,
DEPLOYMENT_KEY, OVERRIDE_KEY };

@@ -91,12 +80,6 @@
//--------------------------------------------------------------

/**
- * Set the security enabled policy
- * @param mode TRUE to enabled security mode else FALSE
- */
- void setSecurityMode( boolean mode );
-
- /**
* Set the audit enabled policy
* @param mode TRUE to enabled audit mode else FALSE
*/
@@ -143,12 +126,6 @@
Boolean getAuditMode();

/**
- * Get the security enabled policy
- * @return TRUE if security is enabled else FALSE
- */
- Boolean getSecurityMode();
-
- /**
* Get the runtime artifact.
* @return the artifact referencing a runtime factory plugin
*/

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionException.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@
/**
* Exception to indicate that there was a composition system related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class CompositionException extends ModelException
{

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionFactory.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
/**
* Factory that establishes a root containment model.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: DefaultSystemContext.java 30977 2004-07-30 08:57:54Z niclas
$
*/
public interface CompositionFactory

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionHelper.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionHelper.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionHelper.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,7 @@
/**
* Utility class that supports the listing of a composition tree.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class CompositionHelper

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionRuntimeException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionRuntimeException.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/CompositionRuntimeException.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@
/**
* Exception to indicate that there was a composition system related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class CompositionRuntimeException extends ModelRuntimeException
{

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/ContainmentContext.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/ContainmentContext.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/ContainmentContext.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
/**
* Defintion of a working context.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ContainmentContext extends DeploymentContext

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/DeploymentContext.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/DeploymentContext.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/DeploymentContext.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@
/**
* Deployment context that is supplied to a deployment model.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface DeploymentContext extends Context

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/LifestyleFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/LifestyleFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/LifestyleFactory.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@
/**
* A factory enabling the establishment of runtime handlers.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface LifestyleFactory

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/LifestyleManager.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/LifestyleManager.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/LifestyleManager.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
/**
* A lifestyle handler provides support for a particular lifestyle policy.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface LifestyleManager extends Commissionable, Resolver

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/ModelFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/ModelFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/ModelFactory.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
/**
* A factory enabling the establishment of new containment model instances.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ModelFactory

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/Runtime.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/Runtime.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/provider/Runtime.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@
/**
* Defintion of runtime services.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Runtime

Modified:
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/util/DefaultState.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/util/DefaultState.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/spi/src/main/net/dpml/composition/util/DefaultState.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* The State class desribes the state of a simple action. The state
* may reflect a boolean EXECUTING and a boolean ENABLED.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/


Modified: development/laboratory/users/niclas/osgi/composition/test/build.xml
==============================================================================
--- development/laboratory/users/niclas/osgi/composition/test/build.xml
(original)
+++ development/laboratory/users/niclas/osgi/composition/test/build.xml Sun
Jun 12 09:47:29 2005
@@ -8,8 +8,6 @@
<target name="init" depends="standard.init">
<x:filter feature="plugin" key="dpml-composition-impl"
token="COMPOSITION_IMPL_URI"/>
<x:filter feature="plugin" key="dpml-system-impl"
token="TRANSIT-IMPL-SPEC"/>
- <x:filter feature="uri" key="avalon-framework-api"
token="AVALON-API-SPEC"/>
- <x:filter feature="uri" key="avalon-framework-impl"
token="AVALON-IMPL-SPEC"/>
<x:filter feature="uri" key="dpml-test-testa" token="TEST-A-SPEC"/>
<x:filter feature="uri" key="dpml-test-testb" token="TEST-B-SPEC"/>
<x:filter feature="uri" key="dpml-test-testc" token="TEST-C-SPEC"/>

Modified:
development/laboratory/users/niclas/osgi/composition/test/etc/test/context.xml
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/test/etc/test/context.xml
(original)
+++
development/laboratory/users/niclas/osgi/composition/test/etc/test/context.xml
Sun Jun 12 09:47:29 2005
@@ -4,24 +4,23 @@

<classloader>
<classpath>
- <artifact>@AVALON-API-SPEC@</artifact>
<artifact>@TEST-A-SPEC@</artifact>
</classpath>
</classloader>

<component name="test-a" class="net.dpml.test.testa.TestA">
<context class="net.dpml.test.testa.DefaultFacade">
- <entry key="home">
- <constructor class="java.io.File">
- <param class="java.io.File">${urn:avalon:home}</param>
+ <entry key="home" class="java.io.File">
+ <constructor>
+ <param class="java.io.File">${urn:metro:dir}</param>
<param>xxx</param>
</constructor>
</entry>
- <entry key="time">
- <constructor class="java.util.Date"/>
+ <entry key="time" class="java.util.Date">
+ <constructor/>
</entry>
- <entry key="path">
- <import key="urn:avalon:partition"/>
+ <entry key="path" class="java.lang.String" >
+ <import key="urn:metro:partition"/>
</entry>
</context>
</component>

Modified:
development/laboratory/users/niclas/osgi/composition/test/etc/test/cyclicdeps.xml
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/test/etc/test/cyclicdeps.xml
(original)
+++
development/laboratory/users/niclas/osgi/composition/test/etc/test/cyclicdeps.xml
Sun Jun 12 09:47:29 2005
@@ -2,8 +2,6 @@
<container name="test">
<classloader>
<classpath>
- <artifact>@AVALON-API-SPEC@</artifact>
- <artifact>@AVALON-IMPL-SPEC@</artifact>
<artifact>@TEST-CYCLIC-SPEC@</artifact>
</classpath>
</classloader>

Modified:
development/laboratory/users/niclas/osgi/composition/test/etc/test/dependency.xml
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/test/etc/test/dependency.xml
(original)
+++
development/laboratory/users/niclas/osgi/composition/test/etc/test/dependency.xml
Sun Jun 12 09:47:29 2005
@@ -4,8 +4,6 @@

<classloader>
<classpath>
- <artifact>@AVALON-API-SPEC@</artifact>
- <artifact>@AVALON-IMPL-SPEC@</artifact>
<artifact>@TEST-A-SPEC@</artifact>
<artifact>@TEST-B-SPEC@</artifact>
<artifact>@TEST-C-SPEC@</artifact>
@@ -14,17 +12,15 @@

<component name="test-a" class="net.dpml.test.testa.TestA">
<context class="net.dpml.test.testa.DefaultFacade">
- <entry key="home">
- <constructor class="java.io.File">
- <param class="java.io.File">${urn:avalon:home}</param>
+ <entry key="home" class="java.io.File">
+ <constructor >
+ <param class="java.io.File">${urn:metro:dir}</param>
<param>xxx</param>
</constructor>
</entry>
- <entry key="time">
- <constructor class="java.util.Date"/>
- </entry>
- <entry key="path">
- <import key="urn:avalon:partition"/>
+ <entry key="time" class="java.util.Date" />
+ <entry key="path" class="java.lang.String" >
+ <import key="urn:metro:partition"/>
</entry>
</context>
</component>

Modified:
development/laboratory/users/niclas/osgi/composition/test/etc/test/dynamics.xml
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/test/etc/test/dynamics.xml
(original)
+++
development/laboratory/users/niclas/osgi/composition/test/etc/test/dynamics.xml
Sun Jun 12 09:47:29 2005
@@ -2,8 +2,6 @@
<container name="test">
<classloader>
<classpath>
- <artifact>@AVALON-API-SPEC@</artifact>
- <artifact>@AVALON-IMPL-SPEC@</artifact>
<artifact>@TEST-DYNAMICS-SPEC@</artifact>
</classpath>
</classloader>

Modified:
development/laboratory/users/niclas/osgi/composition/test/etc/test/metro.properties
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/test/etc/test/metro.properties
(original)
+++
development/laboratory/users/niclas/osgi/composition/test/etc/test/metro.properties
Sun Jun 12 09:47:29 2005
@@ -1,4 +1,3 @@

metro.info = false
-metro.avalon = true
-color = red
\ No newline at end of file
+color = red

Modified:
development/laboratory/users/niclas/osgi/composition/test/etc/test/schemavalidation.xml
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/test/etc/test/schemavalidation.xml
(original)
+++
development/laboratory/users/niclas/osgi/composition/test/etc/test/schemavalidation.xml
Sun Jun 12 09:47:29 2005
@@ -1,16 +1,14 @@
<container name="test">
- <classloader>
- <classpath>
- <artifact>@AVALON-API-SPEC@</artifact>
- <artifact>@AVALON-IMPL-SPEC@</artifact>
- <artifact>@TEST-SCHEMA-SPEC@</artifact>
- </classpath>
- </classloader>
- <container name="sub">
- <component name="ConfigB"
class="net.dpml.test.testschema.ConfigurableB">
- <configuration attr1="foo">
- <child1/>
- </configuration>
- </component>
- </container>
-</container>
\ No newline at end of file
+ <classloader>
+ <classpath>
+ <artifact>@TEST-SCHEMA-SPEC@</artifact>
+ </classpath>
+ </classloader>
+ <container name="sub">
+ <component name="ConfigB" class="net.dpml.test.testschema.ConfigurableB">
+ <configuration attr1="foo">
+ <child1/>
+ </configuration>
+ </component>
+ </container>
+</container>

Modified:
development/laboratory/users/niclas/osgi/composition/test/etc/test/schemavalidation_failing.xml
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/test/etc/test/schemavalidation_failing.xml
(original)
+++
development/laboratory/users/niclas/osgi/composition/test/etc/test/schemavalidation_failing.xml
Sun Jun 12 09:47:29 2005
@@ -1,13 +1,11 @@
<container name="test">
- <classloader>
- <classpath>
- <artifact>@AVALON-API-SPEC@</artifact>
- <artifact>@AVALON-IMPL-SPEC@</artifact>
- <artifact>@TEST-SCHEMA-SPEC@</artifact>
- </classpath>
- </classloader>
- <container name="sub">
- <component name="ConfigB"
class="net.dpml.test.testschema.ConfigurableB">
- </component>
- </container>
-</container>
\ No newline at end of file
+ <classloader>
+ <classpath>
+ <artifact>@TEST-SCHEMA-SPEC@</artifact>
+ </classpath>
+ </classloader>
+ <container name="sub">
+ <component name="ConfigB" class="net.dpml.test.testschema.ConfigurableB">
+ </component>
+ </container>
+</container>

Modified:
development/laboratory/users/niclas/osgi/composition/test/etc/test/targets-config.xml
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/test/etc/test/targets-config.xml
(original)
+++
development/laboratory/users/niclas/osgi/composition/test/etc/test/targets-config.xml
Sun Jun 12 09:47:29 2005
@@ -1,20 +1,19 @@
-
-<targets>
-
- <target path="/test/aaa">
- <configuration>
- <source>External configuration target for AAA.</source>
- </configuration>
- </target>
-
- <target path="/test/ccc/sss">
- <security profile="default"/>
- </target>
-
- <target path="/test/ccc/sss/xxx">
- <configuration>
- <source>External configuration target for XXX.</source>
- </configuration>
- </target>
-
-</targets>
+
+<targets>
+
+ <target path="/test/aaa">
+ <configuration>
+ <source>External configuration target for AAA.</source>
+ </configuration>
+ </target>
+
+ <target path="/test/ccc/sss">
+ </target>
+
+ <target path="/test/ccc/sss/xxx">
+ <configuration>
+ <source>External configuration target for XXX.</source>
+ </configuration>
+ </target>
+
+</targets>

Modified:
development/laboratory/users/niclas/osgi/composition/test/etc/test/targets.xml
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/test/etc/test/targets.xml
(original)
+++
development/laboratory/users/niclas/osgi/composition/test/etc/test/targets.xml
Sun Jun 12 09:47:29 2005
@@ -1,28 +1,26 @@
-
- <container name="test">
-
- <classloader>
- <classpath>
- <artifact>@AVALON-API-SPEC@</artifact>
- <artifact>@AVALON-IMPL-SPEC@</artifact>
- <artifact>@TEST-A-SPEC@</artifact>
- </classpath>
- </classloader>
-
- <component
- class="net.dpml.test.testa.ConfigurableComponent"
- name="aaa"/>
-
- <component
- class="net.dpml.test.testa.ConfigurableComponent"
- name="bbb"/>
-
- <container name="ccc">
- <container name="sss">
- <component
- class="net.dpml.test.testa.ConfigurableComponent"
- name="xxx"/>
- </container>
- </container>
-
-</container>
+
+ <container name="test">
+
+ <classloader>
+ <classpath>
+ <artifact>@TEST-A-SPEC@</artifact>
+ </classpath>
+ </classloader>
+
+ <component
+ class="net.dpml.test.testa.ConfigurableComponent"
+ name="aaa"/>
+
+ <component
+ class="net.dpml.test.testa.ConfigurableComponent"
+ name="bbb"/>
+
+ <container name="ccc">
+ <container name="sss">
+ <component
+ class="net.dpml.test.testa.ConfigurableComponent"
+ name="xxx"/>
+ </container>
+ </container>
+
+</container>

Modified:
development/laboratory/users/niclas/osgi/composition/test/src/main/net/dpml/composition/test/CompositionTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/test/src/main/net/dpml/composition/test/CompositionTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/test/src/main/net/dpml/composition/test/CompositionTestCase.java
Sun Jun 12 09:47:29 2005
@@ -37,7 +37,7 @@

/**
* AbstractCompositionTestCase
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public abstract class CompositionTestCase extends TestCase

Modified:
development/laboratory/users/niclas/osgi/composition/test/src/test/net/dpml/composition/model/impl/test/ContextTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/composition/test/src/test/net/dpml/composition/model/impl/test/ContextTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/composition/test/src/test/net/dpml/composition/model/impl/test/ContextTestCase.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@

/**
* CompositionFactoryTestCase
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ContextTestCase extends CompositionTestCase
@@ -95,11 +95,11 @@
{
try
{
- ClassLoader loader = (ClassLoader) m_map.get(
"urn:avalon:classloader" );
+ ClassLoader loader = (ClassLoader) m_map.get(
"urn:metro:classloader" );
}
catch( Throwable e )
{
- fail( "urn:avalon:classloader" );
+ fail( "urn:metro:classloader" );
}
}

@@ -107,11 +107,11 @@
{
try
{
- File home = (File) m_map.get( "urn:avalon:home" );
+ File home = (File) m_map.get( "urn:metro:dir" );
}
catch( Throwable e )
{
- assertTrue( "urn:avalon:home", false );
+ assertTrue( "urn:metro:home", false );
}
}

@@ -119,11 +119,11 @@
{
try
{
- File temp = (File) m_map.get( "urn:avalon:temp" );
+ File temp = (File) m_map.get( "urn:metro:temp" );
}
catch( Throwable e )
{
- assertTrue( "urn:avalon:temp", false );
+ assertTrue( "urn:metro:temp", false );
}
}

@@ -131,11 +131,11 @@
{
try
{
- String partition = (String) m_map.get( "urn:avalon:partition" );
+ String partition = (String) m_map.get( "urn:metro:partition" );
}
catch( Throwable e )
{
- fail( "urn:avalon:partition" );
+ fail( "urn:metro:partition" );
}
}


Modified:
development/laboratory/users/niclas/osgi/configuration/api/src/main/net/dpml/configuration/Configurable.java
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/api/src/main/net/dpml/configuration/Configurable.java
(original)
+++
development/laboratory/users/niclas/osgi/configuration/api/src/main/net/dpml/configuration/Configurable.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
*
* Note that this interface is incompatible with Parameterizable.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Configurable

Modified:
development/laboratory/users/niclas/osgi/configuration/api/src/main/net/dpml/configuration/Configuration.java
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/api/src/main/net/dpml/configuration/Configuration.java
(original)
+++
development/laboratory/users/niclas/osgi/configuration/api/src/main/net/dpml/configuration/Configuration.java
Sun Jun 12 09:47:29 2005
@@ -91,7 +91,7 @@
* <code>true</code></td></tr>
* <tr align="center"><td align="left">
* <code>conf.{@link #getChild getChild}("widget").{@link #getLocation
getLocation}()</code>
- * </td><td
colspan="2">file:///home/jeff/tmp/java/avalon/src/java/new.xconf:4:60</td></tr>
+ * </td><td
colspan="2">file:///home/jeff/tmp/java/metro/src/java/new.xconf:4:60</td></tr>
* <tr align="center"><td align="left">
* <code>conf.{@link #getChild getChild}("desc").{@link #getName
getName}()</code>
* </td><td>desc (see {@link #getChild(String)})</td><td>desc</td></tr>
@@ -132,7 +132,7 @@
* }
* </pre>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Configuration

Modified:
development/laboratory/users/niclas/osgi/configuration/api/src/main/net/dpml/configuration/ConfigurationException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/api/src/main/net/dpml/configuration/ConfigurationException.java
(original)
+++
development/laboratory/users/niclas/osgi/configuration/api/src/main/net/dpml/configuration/ConfigurationException.java
Sun Jun 12 09:47:29 2005
@@ -19,7 +19,7 @@
/**
* Thrown in response to a missing or invalid configuration fragment.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ConfigurationException

Modified:
development/laboratory/users/niclas/osgi/configuration/api/src/main/net/dpml/configuration/package.html
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/api/src/main/net/dpml/configuration/package.html
(original)
+++
development/laboratory/users/niclas/osgi/configuration/api/src/main/net/dpml/configuration/package.html
Sun Jun 12 09:47:29 2005
@@ -1,7 +1,7 @@
<body bgcolor="white">
Component configuration interfaces and XML-based implementations.
<br><br>
- <p>The <code>org.apache.avalon.framework.configuration</code> package
contains primarily:</p>
+ <p>The <code>net.dpml.configuration</code> package contains
primarily:</p>
<ul>
<li>The <a href="Configurable.html">Configurable</a> interface, which
a Component implements
if it needs to be configured with externally-specified data before it
is initialized.

Modified:
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/AbstractConfiguration.java
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/AbstractConfiguration.java
(original)
+++
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/AbstractConfiguration.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@
* This is an abstract <code>Configuration</code> implementation that deals
* with methods that can be abstracted away from underlying implementations.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public abstract class AbstractConfiguration

Modified:
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/CascadingConfiguration.java
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/CascadingConfiguration.java
(original)
+++
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/CascadingConfiguration.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,7 @@
* configuration. As a parent may also be a CascadingConfiguration, the
evaluation
* will be applied until a value is resolved against a class parent
Configuration.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class CascadingConfiguration implements Configuration
{

Modified:
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/ConfigurationUtil.java
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/ConfigurationUtil.java
(original)
+++
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/ConfigurationUtil.java
Sun Jun 12 09:47:29 2005
@@ -38,7 +38,7 @@
* This class has a bunch of utility methods to work
* with configuration objects.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
* @since 4.1.4
*/

Modified:
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/DefaultConfiguration.java
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/DefaultConfiguration.java
(original)
+++
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/DefaultConfiguration.java
Sun Jun 12 09:47:29 2005
@@ -27,12 +27,11 @@
/**
* This is the default <code>Configuration</code> implementation.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
-public class DefaultConfiguration
- extends AbstractConfiguration
- implements MutableConfiguration, Serializable
+public class DefaultConfiguration extends AbstractConfiguration
+ implements Serializable
{
/**
* An empty (length zero) array of configuration objects.
@@ -623,114 +622,6 @@
}

/**
- * Convenience function to convert a child to a mutable configuration.
- * If the child is-a MutableConfiguration, and it isn't a read-only
DefaultConfiguration
- * (which isn't really mutable), the child is cast to
MutableConfiguration and returned.
- * If not, the child is replaced in the m_children array with a new
writable DefaultConfiguration
- * that is a shallow copy of the child, and the new child is returned.
- */
- private MutableConfiguration toMutable( Configuration child ) throws
ConfigurationException
- {
- if (child instanceof MutableConfiguration &&
- !( child instanceof DefaultConfiguration &&
((DefaultConfiguration) child).isReadOnly() ))
- {
- // Child is already mutable - return it.
- return (MutableConfiguration) child;
- }
-
- // Child isn't mutable. (This is a mutating operation, so let's check
- // if we're writable.)
- checkWriteable();
-
- DefaultConfiguration config = new DefaultConfiguration( child );
-
- // Replace the old child.
- for( int i = 0; i < m_children.size(); i++)
- {
- if( m_children.get(i) == child )
- {
- m_children.set( i, config );
- break;
- }
- }
-
- return config;
- }
-
- public MutableConfiguration getMutableChild( final String name ) throws
ConfigurationException
- {
- return getMutableChild( name, true );
- }
-
- public MutableConfiguration getMutableChild( final String name, boolean
autoCreate ) throws ConfigurationException
- {
- Configuration child = getChild( name, false );
- if( child == null )
- {
- // No child. Create?
-
- if( autoCreate )
- {
- DefaultConfiguration config = new DefaultConfiguration(
name, "-" );
- addChild( config );
- return config;
- }
- else
- {
- return null;
- }
- }
-
- // Child exists
- return toMutable( child );
- }
-
- public MutableConfiguration[] getMutableChildren() throws
ConfigurationException
- {
- if( null == m_children )
- {
- return new MutableConfiguration[ 0 ];
- }
- else
- {
- final ArrayList children = new ArrayList();
- final int size = m_children.size();
-
- for( int i = 0; i < size; i++ )
- {
- final Configuration configuration =
(Configuration)m_children.get( i );
- children.add( toMutable( configuration ) );
- }
-
- return (MutableConfiguration[])children.toArray( new
MutableConfiguration[ 0 ] );
- }
- }
-
- public MutableConfiguration[] getMutableChildren( final String name )
throws ConfigurationException
- {
- if( null == m_children )
- {
- return new MutableConfiguration[ 0 ];
- }
- else
- {
- final ArrayList children = new ArrayList();
- final int size = m_children.size();
-
- for( int i = 0; i < size; i++ )
- {
- final Configuration configuration =
(Configuration)m_children.get( i );
- if( name.equals( configuration.getName() ) )
- {
- children.add( toMutable( configuration ) );
- }
- }
-
- return (MutableConfiguration[])children.toArray( new
MutableConfiguration[ 0 ] );
- }
- }
-
- /**
* Compare if this configuration is equal to another.
*
* @param other The other configuration

Modified:
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/DefaultConfigurationBuilder.java
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/DefaultConfigurationBuilder.java
(original)
+++
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/DefaultConfigurationBuilder.java
Sun Jun 12 09:47:29 2005
@@ -67,7 +67,7 @@
* in that case the whitespace is left intact.
* </p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultConfigurationBuilder

Modified:
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/DefaultConfigurationSerializer.java
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/DefaultConfigurationSerializer.java
(original)
+++
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/DefaultConfigurationSerializer.java
Sun Jun 12 09:47:29 2005
@@ -40,7 +40,7 @@
/**
* A ConfigurationSerializer serializes configurations via SAX2 compliant
parser.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultConfigurationSerializer

Modified:
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/NamespacedSAXConfigurationHandler.java
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/NamespacedSAXConfigurationHandler.java
(original)
+++
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/NamespacedSAXConfigurationHandler.java
Sun Jun 12 09:47:29 2005
@@ -33,7 +33,7 @@
* A SAXConfigurationHandler helps build Configurations out of sax events,
* including namespace information.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class NamespacedSAXConfigurationHandler

Modified:
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/SAXConfigurationHandler.java
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/SAXConfigurationHandler.java
(original)
+++
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/SAXConfigurationHandler.java
Sun Jun 12 09:47:29 2005
@@ -31,7 +31,7 @@
/**
* A SAXConfigurationHandler helps build Configurations out of sax events.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class SAXConfigurationHandler

Modified:
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/package.html
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/package.html
(original)
+++
development/laboratory/users/niclas/osgi/configuration/impl/src/main/net/dpml/configuration/impl/package.html
Sun Jun 12 09:47:29 2005
@@ -1,7 +1,7 @@
<body bgcolor="white">
Component configuration interfaces and XML-based implementations.
<br><br>
- <p>The <code>org.apache.avalon.framework.configuration</code> package
contains primarily:</p>
+ <p>The <code>net.dpml.configuration</code> package contains
primarily:</p>
<ul>
<li>The <a href="Configurable.html">Configurable</a> interface, which
a Component implements
if it needs to be configured with externally-specified data before it
is initialized.

Modified:
development/laboratory/users/niclas/osgi/configuration/impl/src/test/net/dpml/configuration/test/DefaultConfigurationBuilderTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/impl/src/test/net/dpml/configuration/test/DefaultConfigurationBuilderTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/configuration/impl/src/test/net/dpml/configuration/test/DefaultConfigurationBuilderTestCase.java
Sun Jun 12 09:47:29 2005
@@ -39,7 +39,7 @@
* Test that the <code>Configuration</code>s built by
* <code>DefaultConfigurationBuilder</code> meet the stated API contracts.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public final class DefaultConfigurationBuilderTestCase
extends TestCase

Modified:
development/laboratory/users/niclas/osgi/configuration/impl/src/test/net/dpml/configuration/test/DefaultConfigurationSerializerTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/impl/src/test/net/dpml/configuration/test/DefaultConfigurationSerializerTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/configuration/impl/src/test/net/dpml/configuration/test/DefaultConfigurationSerializerTestCase.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
/**
* Test the basic public methods of DefaultConfigurationSerializer.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public final class DefaultConfigurationSerializerTestCase extends TestCase
{

Modified:
development/laboratory/users/niclas/osgi/configuration/impl/src/test/net/dpml/configuration/test/DefaultConfigurationTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/impl/src/test/net/dpml/configuration/test/DefaultConfigurationTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/configuration/impl/src/test/net/dpml/configuration/test/DefaultConfigurationTestCase.java
Sun Jun 12 09:47:29 2005
@@ -22,12 +22,11 @@
import net.dpml.configuration.ConfigurationException;
import net.dpml.configuration.impl.ConfigurationUtil;
import net.dpml.configuration.impl.DefaultConfiguration;
-import net.dpml.configuration.impl.MutableConfiguration;

/**
* Test the basic public methods of DefaultConfiguration.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public final class DefaultConfigurationTestCase extends TestCase
{
@@ -190,55 +189,6 @@
}
}

- public void testMutable() throws Exception
- {
- MutableConfiguration root = new DefaultConfiguration( "root", "-" );

- root.setAttribute( "root1", "root1" );
- root.setAttribute( "root2", "root2" );
- root.getMutableChild( "child1" ).setAttribute( "child1-attr1",
"child1-attr1" );
- root.getMutableChild( "child1" ).setAttribute( "child1-attr2",
"child1-attr2" );
- root.getMutableChild( "child2" ).setAttribute( "child2-attr1",
"child2-attr1" );
- root.getMutableChild( "child2" ).setAttribute( "child2-attr2",
"child2-attr2" );
-
- assertEquals( "root1", root.getAttribute( "root1" ) );
- assertEquals( "root2", root.getAttribute( "root2" ) );
- assertEquals( "child1-attr1", root.getChild( "child1"
).getAttribute( "child1-attr1" ) );
- assertEquals( "child1-attr2", root.getChild( "child1"
).getAttribute( "child1-attr2" ) );
- assertEquals( "child2-attr1", root.getChild( "child2"
).getAttribute( "child2-attr1" ) );
- assertEquals( "child2-attr2", root.getChild( "child2"
).getAttribute( "child2-attr2" ) );
-
- assertEquals( null, root.getMutableChild( "child3", false ) );
-
- assertEquals( 2, root.getChildren().length );
-
- assertEquals( 2, root.getMutableChildren().length );
- assertEquals( 1, root.getMutableChildren( "child1" ).length );
- assertEquals( 1, root.getMutableChildren( "child2" ).length );
- assertTrue( root.getMutableChildren( "child1" )[0] == root.getChild(
"child1" ) );
-
- // Add an immutable child.
- DefaultConfiguration immutableChild = new DefaultConfiguration(
"immutable-child", "-" );
- immutableChild.makeReadOnly();
-
- try
- {
- immutableChild.setAttribute( "attr", "attr" );
- fail( "Read-only DefaultConfiguration wasn't read-only!" );
- }
- catch (IllegalStateException ise)
- {
- // expected
- }
-
- root.addChild( immutableChild );
-
- // OK, ask to have it back.
- root.getMutableChild( "immutable-child" ).setAttribute( "attr",
"attr" );
-
- assertEquals( 1, root.getChildren( "immutable-child" ).length );
- assertEquals( "attr", root.getChild( "immutable-child"
).getAttribute( "attr" ) );
- }
-
public void testEquals()
throws Exception
{

Modified:
development/laboratory/users/niclas/osgi/configuration/impl/src/test/net/dpml/configuration/test/SAXConfigurationHandlerTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/configuration/impl/src/test/net/dpml/configuration/test/SAXConfigurationHandlerTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/configuration/impl/src/test/net/dpml/configuration/test/SAXConfigurationHandlerTestCase.java
Sun Jun 12 09:47:29 2005
@@ -27,7 +27,7 @@
/**
* Test the basic public methods of SAXConfigurationHandlerTestCase.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public final class SAXConfigurationHandlerTestCase extends TestCase
{

Modified:
development/laboratory/users/niclas/osgi/context/api/src/main/net/dpml/context/Context.java
==============================================================================
---
development/laboratory/users/niclas/osgi/context/api/src/main/net/dpml/context/Context.java
(original)
+++
development/laboratory/users/niclas/osgi/context/api/src/main/net/dpml/context/Context.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
* <p>
* <i><b>Note:</b> In the text below there are several requirements that a
* component may set up for a container. It is understood that a container
- * does not have to satisfy those requirements in order to be
Avalon-compliant.
+ * does not have to satisfy those requirements in order to be compliant.
* If a component says "I require X to run" a container may reply with "I
don't
* have any X, so I'm not running you". The requirements here are the maximum
* that a component may ask for, not the minimum a container must deliver.
@@ -94,14 +94,14 @@
* </p>
*
* <p>
- * Standard Avalon context entries, their keys, types and and
+ * Standard context entries, their keys, types and and
* associated semantics are defined under the framework standard
* attributes table.
* </p>
*
* <p>
* See: <a href="package-summary.html#attributes">
- * Avalon Standard Context Entries Specification</a>
+ * Standard Context Entries Specification</a>
* </p>
*
* <h4>Examples, where the data is specified in a sample XML format:</h4>
@@ -112,13 +112,13 @@
* When a component specifies:
* </p>
*
- * <pre><code> &lt;entry key="avalon:work"
type="java.io.File"/&gt;</code></pre>
+ * <pre><code> &lt;entry key="urn:metro:work"
type="java.io.File"/&gt;</code></pre>
*
* <p>
* It should be able to do:
* </p>
*
- * <pre><code> File workDirectory = (File) context.get( "avalon:work"
);</code></pre>
+ * <pre><code> File workDirectory = (File) context.get(
"urn:metro:work" );</code></pre>
*
* <p>
* in order to obtain the value.
@@ -130,7 +130,7 @@
* When a component specifies:
* </p>
*
- * <pre><code> &lt;entry alias="work" key="avalon:work"
type="java.io.File"/&gt;</code></pre>
+ * <pre><code> &lt;entry alias="work" key="urn:metro:work"
type="java.io.File"/&gt;</code></pre>
*
* <p>
* It should be able to do:
@@ -140,7 +140,7 @@
* </li>
* </ol>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Context

Modified:
development/laboratory/users/niclas/osgi/context/api/src/main/net/dpml/context/ContextException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/context/api/src/main/net/dpml/context/ContextException.java
(original)
+++
development/laboratory/users/niclas/osgi/context/api/src/main/net/dpml/context/ContextException.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@
* found. It can also be thrown manually in contextualize()
* when Component detects a malformed context value.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ContextException

Modified:
development/laboratory/users/niclas/osgi/context/api/src/main/net/dpml/context/Contextualizable.java
==============================================================================
---
development/laboratory/users/niclas/osgi/context/api/src/main/net/dpml/context/Contextualizable.java
(original)
+++
development/laboratory/users/niclas/osgi/context/api/src/main/net/dpml/context/Contextualizable.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* a Context to work. Context contains runtime generated object
* provided by the Container to this Component.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Contextualizable

Modified:
development/laboratory/users/niclas/osgi/context/impl/src/main/net/dpml/context/impl/DefaultContext.java
==============================================================================
---
development/laboratory/users/niclas/osgi/context/impl/src/main/net/dpml/context/impl/DefaultContext.java
(original)
+++
development/laboratory/users/niclas/osgi/context/impl/src/main/net/dpml/context/impl/DefaultContext.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@
* Default implementation of Context.
* This implementation is a static hierarchial store.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultContext

Modified: development/laboratory/users/niclas/osgi/index.xml
==============================================================================
--- development/laboratory/users/niclas/osgi/index.xml (original)
+++ development/laboratory/users/niclas/osgi/index.xml Sun Jun 12 09:47:29
2005
@@ -2,7 +2,7 @@

<index key="dpml-metro">

- <import uri="${dpml.transit.uri}"/>
+ <import uri="artifact:module:dpml/transit/dpml-transit#2798"/>

<!--
Metro Modules
@@ -95,6 +95,7 @@
<dependencies>
<include key="dpml-parameters-api"/>
<include key="dpml-configuration-api"/>
+ <include key="dpml-transit-main"/>
</dependencies>
</project>

@@ -168,6 +169,7 @@
</types>
</info>
<dependencies>
+ <include key="dpml-transit-main"/>
<include key="dpml-parameters-api"/>
<include key="dpml-configuration-api"/>
<include key="dpml-configuration-impl" build="false" test="true"
runtime="false"/>
@@ -276,40 +278,17 @@
<include key="dpml-util-exception"/>
<include key="dpml-composition-impl" build="false"/>
<include key="dpml-system-impl" build="false"/>
+ <include key="dpml-configuration-impl"/>
+ <include key="dpml-parameters-impl"/>
+ <include key="dpml-context-impl"/>
+
+ <!-- VERY STRANGE THAT THE BELOW IS REQUIRED!!!!!! -->
+ <include key="junit" build="true" runtime="false" test="true" />
</dependencies>
</project>

<!-- FROM PROTECTED INDEX -->

- <!-- Extension -->
-
- <project basedir="extension/api">
- <info>
- <group>dpml/metro/protected</group>
- <name>dpml-extension-api</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- <types>
- <type>jar</type>
- </types>
- </info>
- </project>
-
- <project basedir="extension/impl">
- <info>
- <group>dpml/metro/private</group>
- <name>dpml-extension-impl</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- <types>
- <type>jar</type>
- </types>
- </info>
- <dependencies>
- <include key="dpml-extension-api"/>
- </dependencies>
- </project>
-
<!-- Composition -->

<project basedir="composition/api">
@@ -332,7 +311,6 @@
<include key="dpml-parameters-api"/>
<include key="dpml-logging-api"/>
<include key="dpml-logging-data"/>
- <include key="dpml-extension-api"/>
<include key="dpml-configuration-impl" build="false" test="true"
runtime="false"/>
<include key="dpml-parameters-impl" build="false" test="true"
runtime="false"/>
</dependencies>
@@ -377,13 +355,10 @@
<include key="dpml-configuration-api" tag="api"/>
<include key="dpml-service-api" tag="api"/>
<include key="dpml-meta-api" tag="api"/>
- <include key="dpml-extension-api" tag="api"/>
<include key="dpml-composition-spi" tag="spi"/>
<include key="dpml-meta-spi" tag="spi"/>
<include key="dpml-configuration-impl"/>
<include key="dpml-meta-impl"/>
- <include key="dpml-extension-api" tag="spi"/>
- <include key="dpml-extension-impl"/>
<include key="dpml-util-exception"/>
<include key="dpml-context-impl"/>
<include key="dpml-util-criteria"/>
@@ -419,6 +394,9 @@
<include key="dpml-system-impl" build="false"/>
<include key="dpml-logging-logkit-impl" build="false"/>
<include key="dpml-test-testschema"/>
+
+ <!-- VERY STRANGE THAT THE BELOW IS REQUIRED!!!!!! -->
+ <include key="junit" build="true" runtime="false" test="true" />
</dependencies>
</project>

@@ -432,10 +410,11 @@
<status>SNAPSHOT</status>
<type>jar</type>
</info>
+ <dependencies>
+ <include key="dpml-transit-main"/>
+ </dependencies>
</project>

- <!-- Extension -->
-
<!-- System -->

<project basedir="system/api">
@@ -749,33 +728,6 @@
</dependencies>
</project>

- <project basedir="activation/providers/avalon">
- <info>
- <group>dpml/metro/private</group>
- <name>dpml-activation-avalon-provider</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- <types>
- <type>jar</type>
- <type>plugin</type>
- </types>
- </info>
- <dependencies>
- <include key="dpml-activity-api" tag="api"/>
- <include key="dpml-composition-api" tag="api"/>
- <include key="avalon-framework-api" tag="api"/>
- <include key="dpml-activation-api" tag="api"/>
- <include key="dpml-system-spi" tag="spi"/>
- <include key="dpml-composition-spi" tag="spi"/>
- <include key="avalon-util-lifecycle" tag="api"/>
- <include key="dpml-util-i18n"/>
- <include key="dpml-util-defaults"/>
- <include key="dpml-context-impl"/>
- <include key="dpml-parameters-impl"/>
- <include key="avalon-framework-impl"/>
- </dependencies>
- </project>
-
<project basedir="activation/impl">
<info>
<group>dpml/metro/private</group>
@@ -792,7 +744,6 @@
<include key="dpml-activation-api" tag="api"/>
<include key="dpml-composition-api" tag="api"/>
<include key="dpml-activation-metro-provider" build="false"/>
- <include key="dpml-activation-avalon-provider" build="false"/>
<include key="dpml-system-impl" build="false"/>
</dependencies>
</project>
@@ -864,6 +815,7 @@
<include key="dpml-logging-api"/>
<include key="dpml-context-api"/>
<include key="dpml-configuration-api"/>
+ <include key="dpml-transit-main"/>
</dependencies>
<plugins>
<include key="dpml-meta-tools"/>
@@ -1034,31 +986,6 @@

<resource>
<info>
- <group>avalon-framework</group>
- <name>avalon-framework-api</name>
- <version>4.2.0</version>
- </info>
- </resource>
-
- <resource>
- <info>
- <group>avalon-framework</group>
- <name>avalon-framework-impl</name>
- <version>4.2.0</version>
- </info>
- </resource>
-
- <resource>
- <info>
- <group>avalon/util</group>
- <name>avalon-util-lifecycle</name>
- <version>1.1.1</version>
- </info>
- </resource>
-
-
- <resource>
- <info>
<name>xercesImpl</name>
<version>2.6.2</version>
<group>xerces</group>

Modified:
development/laboratory/users/niclas/osgi/logging/api/src/main/net/dpml/logging/AbstractLogEnabled.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/api/src/main/net/dpml/logging/AbstractLogEnabled.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/api/src/main/net/dpml/logging/AbstractLogEnabled.java
Sun Jun 12 09:47:29 2005
@@ -19,7 +19,7 @@
* Utility class to allow easy construction of components that will perform
* logging.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public abstract class AbstractLogEnabled

Modified:
development/laboratory/users/niclas/osgi/logging/api/src/main/net/dpml/logging/LogEnabled.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/api/src/main/net/dpml/logging/LogEnabled.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/api/src/main/net/dpml/logging/LogEnabled.java
Sun Jun 12 09:47:29 2005
@@ -19,7 +19,7 @@
* Components that need to log can implement this interface to
* be provided Loggers.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface LogEnabled

Modified:
development/laboratory/users/niclas/osgi/logging/api/src/main/net/dpml/logging/Logger.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/api/src/main/net/dpml/logging/Logger.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/api/src/main/net/dpml/logging/Logger.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
* It offers a simplified interface that follows IOC patterns
* and a simplified priority/level/severity abstraction.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Logger

Modified:
development/laboratory/users/niclas/osgi/logging/criteria/src/main/net/dpml/logging/criteria/ConfigurationParameter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/criteria/src/main/net/dpml/logging/criteria/ConfigurationParameter.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/criteria/src/main/net/dpml/logging/criteria/ConfigurationParameter.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,7 @@
* A parameter descriptor that supports transformation of a
* a string url to an URL instance.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ConfigurationParameter extends Parameter

Modified:
development/laboratory/users/niclas/osgi/logging/criteria/src/main/net/dpml/logging/criteria/ConsoleLogger.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/criteria/src/main/net/dpml/logging/criteria/ConsoleLogger.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/criteria/src/main/net/dpml/logging/criteria/ConsoleLogger.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* This is mainly for the cases when you have a utility that
* does not have a logger to supply.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ConsoleLogger

Modified:
development/laboratory/users/niclas/osgi/logging/criteria/src/main/net/dpml/logging/criteria/DefaultLoggingCriteria.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/criteria/src/main/net/dpml/logging/criteria/DefaultLoggingCriteria.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/criteria/src/main/net/dpml/logging/criteria/DefaultLoggingCriteria.java
Sun Jun 12 09:47:29 2005
@@ -33,7 +33,7 @@
* DefaultLoggingCriteria is a class holding the values supplied by a user
* for application to a LoggingManager factory.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultLoggingCriteria extends Criteria implements
LoggingCriteria

Modified:
development/laboratory/users/niclas/osgi/logging/criteria/src/main/net/dpml/logging/criteria/LoggerParameter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/criteria/src/main/net/dpml/logging/criteria/LoggerParameter.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/criteria/src/main/net/dpml/logging/criteria/LoggerParameter.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@
* A parameter descriptor that supports transformation of a
* a string to a Logger instance.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class LoggerParameter extends Parameter

Modified:
development/laboratory/users/niclas/osgi/logging/data/src/main/net/dpml/logging/data/CategoriesDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/data/src/main/net/dpml/logging/data/CategoriesDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/data/src/main/net/dpml/logging/data/CategoriesDirective.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
* Description of the configuration of a set of categories.
*
* @see CategoryDirective
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: CategoriesDirective.java 259 2004-10-30 07:24:40Z mcconnell
$
*/
public class CategoriesDirective extends CategoryDirective implements
Serializable

Modified:
development/laboratory/users/niclas/osgi/logging/data/src/main/net/dpml/logging/data/CategoryDirective.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/data/src/main/net/dpml/logging/data/CategoryDirective.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/data/src/main/net/dpml/logging/data/CategoryDirective.java
Sun Jun 12 09:47:29 2005
@@ -39,7 +39,7 @@
* &lt;category name="<font color="darkred">verifier</font>" /&gt;
* &lt;/categories&gt;
* </pre>
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: CategoryDirective.java 259 2004-10-30 07:24:40Z mcconnell $
*/
public class CategoryDirective implements Serializable

Modified:
development/laboratory/users/niclas/osgi/logging/data/src/test/net/dpml/logging/data/test/CategoriesDirectiveTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/data/src/test/net/dpml/logging/data/test/CategoriesDirectiveTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/data/src/test/net/dpml/logging/data/test/CategoriesDirectiveTestCase.java
Sun Jun 12 09:47:29 2005
@@ -31,7 +31,7 @@
/**
* CategoriesDirectiveTestCase.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: CategoriesDirectiveTestCase.java 259 2004-10-30 07:24:40Z
mcconnell $
*/
public class CategoriesDirectiveTestCase extends CategoryDirectiveTestCase

Modified:
development/laboratory/users/niclas/osgi/logging/data/src/test/net/dpml/logging/data/test/CategoryDirectiveTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/data/src/test/net/dpml/logging/data/test/CategoryDirectiveTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/data/src/test/net/dpml/logging/data/test/CategoryDirectiveTestCase.java
Sun Jun 12 09:47:29 2005
@@ -33,7 +33,7 @@
/**
* CategoryTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: CategoryDirectiveTestCase.java 259 2004-10-30 07:24:40Z
mcconnell $
*/
public class CategoryDirectiveTestCase extends TestCase

Modified:
development/laboratory/users/niclas/osgi/logging/providers/log4j/impl/src/main/net/dpml/logging/log4j/Log4JLogger.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/log4j/impl/src/main/net/dpml/logging/log4j/Log4JLogger.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/log4j/impl/src/main/net/dpml/logging/log4j/Log4JLogger.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
* Implementation of the Metro Logger interface using the Log4J
* implementation strategy.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class Log4JLogger

Modified:
development/laboratory/users/niclas/osgi/logging/providers/log4j/impl/src/main/net/dpml/logging/log4j/Log4JLoggingFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/log4j/impl/src/main/net/dpml/logging/log4j/Log4JLoggingFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/log4j/impl/src/main/net/dpml/logging/log4j/Log4JLoggingFactory.java
Sun Jun 12 09:47:29 2005
@@ -47,7 +47,7 @@
/**
* A Log4J factory.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class Log4JLoggingFactory

Modified:
development/laboratory/users/niclas/osgi/logging/providers/log4j/impl/src/main/net/dpml/logging/log4j/LoggingManagerImpl.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/log4j/impl/src/main/net/dpml/logging/log4j/LoggingManagerImpl.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/log4j/impl/src/main/net/dpml/logging/log4j/LoggingManagerImpl.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@

/**
* A <code>LoggerManager</code> that supports the management of a logging
hierarchy.
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class LoggingManagerImpl
implements LoggingManager

Modified:
development/laboratory/users/niclas/osgi/logging/providers/log4j/test/etc/test/logging.properties
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/log4j/test/etc/test/logging.properties
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/log4j/test/etc/test/logging.properties
Sun Jun 12 09:47:29 2005
@@ -9,6 +9,6 @@
log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n

# Print only messages of level WARN or above in the package com.foo.
-log4j.logger.org.apache.avalon.logging=DEBUG
+log4j.logger.net.dpml.logging=DEBUG
log4j.logger.kernel.logger=WARN
log4j.logger.kernel.logger.test=DEBUG

Modified:
development/laboratory/users/niclas/osgi/logging/providers/log4j/test/etc/test/logging.xml
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/log4j/test/etc/test/logging.xml
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/log4j/test/etc/test/logging.xml
Sun Jun 12 09:47:29 2005
@@ -18,7 +18,7 @@
</layout>
</appender>

- <category name="org.apache.avalon.logging">
+ <category name="net.dpml.logging">
<priority value="DEBUG"/>
</category>


Modified:
development/laboratory/users/niclas/osgi/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/AlternateLoggingManagerTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/AlternateLoggingManagerTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/AlternateLoggingManagerTestCase.java
Sun Jun 12 09:47:29 2005
@@ -27,7 +27,7 @@
/**
*
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class AlternateLoggingManagerTestCase extends TestCase

Modified:
development/laboratory/users/niclas/osgi/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/DefaultLoggingManagerTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/DefaultLoggingManagerTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/DefaultLoggingManagerTestCase.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
/**
*
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultLoggingManagerTestCase extends TestCase

Modified:
development/laboratory/users/niclas/osgi/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/LoggingManagerHelper.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/LoggingManagerHelper.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/LoggingManagerHelper.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,7 @@
/**
*
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class LoggingManagerHelper

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/ContextMap.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/ContextMap.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/ContextMap.java
Sun Jun 12 09:47:29 2005
@@ -37,8 +37,7 @@
* The context is bound to a thread (and inherited by sub-threads) but
* it can also be added to by LogTargets.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public final class ContextMap
implements Serializable
@@ -78,7 +77,6 @@
*/
public static final ContextMap getCurrentContext( final boolean
autocreate )
{
- //Check security permission here???
ContextMap context = (ContextMap)c_localContext.get();

if( null == context && autocreate )

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/ErrorAware.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/ErrorAware.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/ErrorAware.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* Interface implemented by components that wish to
* delegate ErrorHandling to an ErrorHandler.
*
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public interface ErrorAware
{

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/ErrorHandler.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/ErrorHandler.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/ErrorHandler.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* Handle unrecoverable errors that occur during logging.
* Based on Log4js notion of ErrorHandlers.
*
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public interface ErrorHandler
{

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/Formatter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/Formatter.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/Formatter.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/** This defines the interface for components that wish to serialize
* LogEvents into Strings.
*
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public interface Formatter
{

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/FormatterFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/FormatterFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/FormatterFactory.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@

/**
* Factory for Formatters.
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface FormatterFactory

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogEvent.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogEvent.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogEvent.java
Sun Jun 12 09:47:29 2005
@@ -25,8 +25,7 @@
* LogEvents usually originate at a Logger and are routed
* to LogTargets.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public final class LogEvent
implements Serializable

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTarget.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTarget.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTarget.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
* Warning: If performance becomes a problem then this
* interface will be rewritten as a abstract class.
*
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public interface LogTarget
{

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetException.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetException.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
/**
* Exception to indicate that there was a logging target creation error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class LogTargetException

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetFactory.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
* LogTargetFactory Interface. New instances of log target factories
* are created by the logging manager factory.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface LogTargetFactory

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetFactoryBuilder.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetFactoryBuilder.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetFactoryBuilder.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
/**
* A LogTargetFactoryBuilder provides support for the establishment of
* new logging targets.
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface LogTargetFactoryBuilder

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetFactoryManager.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetFactoryManager.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetFactoryManager.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
/**
* The LogTargetFactoryManager interface.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface LogTargetFactoryManager

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetManager.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetManager.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LogTargetManager.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
/**
* LogTargetManager Interface.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface LogTargetManager

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/Logger.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/Logger.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/Logger.java
Sun Jun 12 09:47:29 2005
@@ -23,8 +23,7 @@
/**
* The object interacted with by client objects to perform logging.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class Logger
{

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LoggerListener.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LoggerListener.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/LoggerListener.java
Sun Jun 12 09:47:29 2005
@@ -23,8 +23,7 @@
* The LoggerListener class is used to notify listeners
* when a new Logger object is created. Loggers are created
* when a client requests a new Logger via {@link Logger#getChildLogger}.
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/

public abstract class LoggerListener

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/MissingIdException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/MissingIdException.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/MissingIdException.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
/**
* Exception to indicate that a log target configuration does not contain a
target id.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class MissingIdException

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/Priority.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/Priority.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/Priority.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
/**
* Class representing and holding constants for priority.
*
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public final class Priority
implements Serializable

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/UnknownLogTargetException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/UnknownLogTargetException.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/api/src/main/net/dpml/logging/logkit/UnknownLogTargetException.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
/**
* Exception to indicate that a log target reference is unknown.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class UnknownLogTargetException

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/DefaultLogTargetFactoryManager.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/DefaultLogTargetFactoryManager.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/DefaultLogTargetFactoryManager.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
* A <code>LoggerManager</code> interface declares operation supporting
* the management of a logging hierarchy.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
class DefaultLogTargetFactoryManager implements LogTargetFactoryManager
{

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/DefaultLogTargetManager.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/DefaultLogTargetManager.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/DefaultLogTargetManager.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
* A <code>LoggerManager</code> interface declares operation supporting
* the management of a logging hierarchy.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
class DefaultLogTargetManager implements LogTargetManager
{

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/DefaultLoggingManager.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/DefaultLoggingManager.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/DefaultLoggingManager.java
Sun Jun 12 09:47:29 2005
@@ -36,7 +36,7 @@
* A <code>LoggerManager</code> interface declares operation supporting
* the management of a logging hierarchy.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class DefaultLoggingManager implements LoggingManager
{

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/Hierarchy.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/Hierarchy.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/Hierarchy.java
Sun Jun 12 09:47:29 2005
@@ -30,8 +30,7 @@
* This class encapsulates a basic independent log hierarchy.
* The hierarchy is essentially a safe wrapper around root logger.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class Hierarchy
{

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/LogKitLogger.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/LogKitLogger.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/LogKitLogger.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
/**
* The default LogKit wrapper class for Logger.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class LogKitLogger

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/StandardFormatter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/StandardFormatter.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/StandardFormatter.java
Sun Jun 12 09:47:29 2005
@@ -38,7 +38,7 @@
* <code>AsyncLogTarget</code>.</li>
* </ul>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class StandardFormatter

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/AbstractOutputTarget.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/AbstractOutputTarget.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/AbstractOutputTarget.java
Sun Jun 12 09:47:29 2005
@@ -26,8 +26,7 @@
* Any new output target that is writing to a single connected
* resource should extend this class directly or indirectly.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public abstract class AbstractOutputTarget
extends AbstractTarget

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/AbstractTarget.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/AbstractTarget.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/AbstractTarget.java
Sun Jun 12 09:47:29 2005
@@ -31,8 +31,7 @@
/**
* Abstract target.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public abstract class AbstractTarget
implements LogTarget, ErrorAware, Closeable

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/FileTargetFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/FileTargetFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/FileTargetFactory.java
Sun Jun 12 09:47:29 2005
@@ -136,7 +136,7 @@
* </dd>
* </dl>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class FileTargetFactory implements LogTargetFactory

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/MulticastTargetFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/MulticastTargetFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/MulticastTargetFactory.java
Sun Jun 12 09:47:29 2005
@@ -34,7 +34,7 @@
* A log target factory that handles creation of a new multicast log
* target instances.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class MulticastTargetFactory implements LogTargetFactory

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/PluginTargetFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/PluginTargetFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/PluginTargetFactory.java
Sun Jun 12 09:47:29 2005
@@ -36,7 +36,7 @@
* A log target factory that establishes log targets based on a
* artifact reference.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class PluginTargetFactory implements LogTargetFactory

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/StreamTargetFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/StreamTargetFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/StreamTargetFactory.java
Sun Jun 12 09:47:29 2005
@@ -48,7 +48,7 @@
*
* <p>The syntax of "format" is the same as in
<code>FileTargetFactory</code>.</p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class StreamTargetFactory implements LogTargetFactory

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/FileTarget.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/FileTarget.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/FileTarget.java
Sun Jun 12 09:47:29 2005
@@ -29,8 +29,7 @@
/**
* A basic target that writes to a File.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class FileTarget extends StreamTarget
{

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/SafeFileTarget.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/SafeFileTarget.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/SafeFileTarget.java
Sun Jun 12 09:47:29 2005
@@ -31,7 +31,7 @@
* filesystems/OSes. It should only be used when there is a
* small number of log events.
*
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class SafeFileTarget
extends FileTarget

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/StreamTarget.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/StreamTarget.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/StreamTarget.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,7 @@
/**
* A basic target that writes to an OutputStream.
*
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class StreamTarget
extends AbstractOutputTarget

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/WriterTarget.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/WriterTarget.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/WriterTarget.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,7 @@
/**
* This target outputs to a writer.
*
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class WriterTarget
extends AbstractOutputTarget

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/FileStrategy.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/FileStrategy.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/FileStrategy.java
Sun Jun 12 09:47:29 2005
@@ -23,8 +23,7 @@
* For a given base file name an implementation calculates
* the real file name.
*
- * @author <a href="mailto:bh22351 AT i-one.at";>Bernhard Huber</a>
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public interface FileStrategy
{

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/OrRotateStrategy.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/OrRotateStrategy.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/OrRotateStrategy.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
* strategy object. If a rotation is needed, this result is returned.
* If not, the next rotation strategy object is checked, and so on.
*
- * @author <a href="mailto:cziegeler AT apache.org";>Carsten Ziegeler</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class OrRotateStrategy
implements RotateStrategy

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RevolvingFileStrategy.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RevolvingFileStrategy.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RevolvingFileStrategy.java
Sun Jun 12 09:47:29 2005
@@ -31,10 +31,7 @@
* are present then it will then set the initial rotation to the next
rotation after
* the most recently created file.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @author <a href="mailto:bh22351 AT i-one.at";>Bernhard Huber</a>
- * @author Peter Donald
- * @author <a href="mailto:david.gray AT hic.gov.au";>David Gray</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class RevolvingFileStrategy
implements FileStrategy

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategy.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategy.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategy.java
Sun Jun 12 09:47:29 2005
@@ -21,8 +21,7 @@
/**
* Strategy that checks condition under which file rotation is needed.
*
- * @author <a href="mailto:leo.sutic AT inspireinfrastructure.com";>Leo Sutic</a>
- * @author <a href="mailto:bh22351 AT i-one.at";>Bernhard Huber</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public interface RotateStrategy
{

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategyByDate.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategyByDate.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategyByDate.java
Sun Jun 12 09:47:29 2005
@@ -23,8 +23,7 @@
/**
* Rotation stragety based on SimpleDateFormat.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @author <a href="mailto:colus AT apache.org";>Eung-ju Park</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class RotateStrategyByDate

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategyBySize.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategyBySize.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategyBySize.java
Sun Jun 12 09:47:29 2005
@@ -29,8 +29,7 @@
* rotation is written. The strategy's internal counter will then
* be off with data.length() bytes.
*
- * @author <a href="mailto:leo.sutic AT inspireinfrastructure.com";>Leo Sutic</a>
- * @author <a href="mailto:bh22351 AT i-one.at";>Bernhard Huber</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class RotateStrategyBySize
implements RotateStrategy

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategyByTime.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategyByTime.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategyByTime.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* rotation stragety based when log writting started.
*
- * @author <a href="mailto:bh22351 AT i-one.at";>Bernhard Huber</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class RotateStrategyByTime
implements RotateStrategy

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategyByTimeOfDay.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategyByTimeOfDay.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotateStrategyByTimeOfDay.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@
/**
* Rotation stragety based on a specific time of day.
*
- * @author <a href="mailto:leif AT apache.org";>Leif Mortenson</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class RotateStrategyByTimeOfDay
implements RotateStrategy

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotatingFileTarget.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotatingFileTarget.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/RotatingFileTarget.java
Sun Jun 12 09:47:29 2005
@@ -25,9 +25,7 @@
/**
* This is a basic Output log target that writes to rotating files.
*
- * @author Peter Donald
- * @author <a href="mailto:mcconnell AT dpml.net";>Stephen McConnell</a>
- * @author <a href="mailto:bh22351 AT i-one.at";>Bernhard Huber</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class RotatingFileTarget
extends FileTarget

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/UniqueFileStrategy.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/UniqueFileStrategy.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate/UniqueFileStrategy.java
Sun Jun 12 09:47:29 2005
@@ -32,8 +32,7 @@
* object will return <code>File</code> objects with file names like
* <code>foo.2001-12-24.log</code>
*
- * @author <a href="mailto:bh22351 AT i-one.at";>Bernhard Huber</a>
- * @author <a href="mailto:giacomo AT apache.org";>Giacomo Pati</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class UniqueFileStrategy
implements FileStrategy

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/ExtendedPatternFormatter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/ExtendedPatternFormatter.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/ExtendedPatternFormatter.java
Sun Jun 12 09:47:29 2005
@@ -34,8 +34,7 @@
* AsyncLogTarget). They then attempt to determine appropriate
* information dynamically.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ExtendedPatternFormatter

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/PatternFormatter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/PatternFormatter.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/PatternFormatter.java
Sun Jun 12 09:47:29 2005
@@ -109,10 +109,7 @@
* and maximum size of 10, followed by the message of the log event
* without any size restriction.
* </p>
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @author Peter Donald
- * @author <a href="mailto:sylvain AT apache.org";>Sylvain Wallez</a>
- * @author <a href="mailto:leif AT tanukisoftware.com";>Leif Mortenson</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class PatternFormatter

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/RawFormatter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/RawFormatter.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/RawFormatter.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
* Basic formatter that just returns raw
* message string and ignores remainder of LogEvent.
*
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class RawFormatter
implements Formatter

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/SyslogFormatter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/SyslogFormatter.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/SyslogFormatter.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
* A formatter that serializes in the format originally
* used by BSD syslog daemon.
*
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class SyslogFormatter
implements Formatter

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/XMLFormatter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/XMLFormatter.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format/XMLFormatter.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@
* Note that this formatter assumes that the category and context
* values will produce strings that do not need to be escaped in XML.
*
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class XMLFormatter
implements Formatter

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util/Closeable.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util/Closeable.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util/Closeable.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* Interface implemented by LogTargets that are capable of being
* closed.
*
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public interface Closeable
{

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util/DefaultErrorHandler.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util/DefaultErrorHandler.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util/DefaultErrorHandler.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
* Handle unrecoverable errors that occur during logging by
* writing to standard error.
*
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class DefaultErrorHandler
implements ErrorHandler

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util/LoggerOutputStream.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util/LoggerOutputStream.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util/LoggerOutputStream.java
Sun Jun 12 09:47:29 2005
@@ -38,8 +38,7 @@
* System.setOut( output );
* </pre>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class LoggerOutputStream
extends OutputStream

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util/StackIntrospector.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util/StackIntrospector.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util/StackIntrospector.java
Sun Jun 12 09:47:29 2005
@@ -24,9 +24,7 @@
/**
* A set of utilities to inspect current stack frame.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @author <a href="mailto:sylvain AT apache.org";>Sylvain Wallez</a>
- * @author <a href="mailto:stuart.roebuck AT adolos.com";>Stuart Roebuck</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class StackIntrospector
@@ -188,7 +186,7 @@
}
else
{
- //At this stage you have the line that looks like
+ //At this point you have the line that looks like
//com.biz.SomeClass.someMethod(SomeClass.java:22)
final String method = line.toString();

@@ -284,7 +282,7 @@
}
else
{
- //At this stage you have the line that looks like
+ //At this point you have the line that looks like
//com.biz.SomeClass.someMethod(SomeClass.java:22)
final String method = line.toString();


Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/datagram/src/main/net/dpml/logging/logkit/datagram/DatagramOutputTarget.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/datagram/src/main/net/dpml/logging/logkit/datagram/DatagramOutputTarget.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/datagram/src/main/net/dpml/logging/logkit/datagram/DatagramOutputTarget.java
Sun Jun 12 09:47:29 2005
@@ -30,8 +30,7 @@
* A datagram output target.
* Useful for writing using custom protocols or writing to syslog daemons.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @author Peter Donald
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class DatagramOutputTarget
extends AbstractOutputTarget

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/datagram/src/main/net/dpml/logging/logkit/datagram/DatagramTargetFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/datagram/src/main/net/dpml/logging/logkit/datagram/DatagramTargetFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/datagram/src/main/net/dpml/logging/logkit/datagram/DatagramTargetFactory.java
Sun Jun 12 09:47:29 2005
@@ -55,7 +55,7 @@
* wraps the format to output the log.
* </p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DatagramTargetFactory implements LogTargetFactory

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/socket/src/main/net/dpml/logging/logkit/socket/SocketOutputTarget.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/socket/src/main/net/dpml/logging/logkit/socket/SocketOutputTarget.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/socket/src/main/net/dpml/logging/logkit/socket/SocketOutputTarget.java
Sun Jun 12 09:47:29 2005
@@ -31,7 +31,7 @@
*
* Useful for writing the output to a TCP/IP client socket.
*
- * @author <a href="mailto:rghorpade AT onebridge.de";> Rajendra Ghorpade </a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class SocketOutputTarget extends AbstractOutputTarget
{

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/socket/src/main/net/dpml/logging/logkit/socket/SocketTargetFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/socket/src/main/net/dpml/logging/logkit/socket/SocketTargetFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/socket/src/main/net/dpml/logging/logkit/socket/SocketTargetFactory.java
Sun Jun 12 09:47:29 2005
@@ -49,7 +49,7 @@
* </p>
*
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class SocketTargetFactory implements LogTargetFactory

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/syslog/src/main/net/dpml/logging/logkit/syslog/SyslogTarget.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/syslog/src/main/net/dpml/logging/logkit/syslog/SyslogTarget.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/syslog/src/main/net/dpml/logging/logkit/syslog/SyslogTarget.java
Sun Jun 12 09:47:29 2005
@@ -27,7 +27,7 @@
import net.dpml.logging.logkit.datagram.DatagramOutputTarget;

/**
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/

@@ -45,7 +45,7 @@
final static public int LOG_MAIL = 2<<3;
/** System daemons */
final static public int LOG_DAEMON = 3<<3;
- /** security/authorization messages */
+ /** authorization messages */
final static public int LOG_AUTH = 4<<3;
/** messages generated internally by syslogd */
final static public int LOG_SYSLOG = 5<<3;
@@ -58,7 +58,7 @@
final static public int LOG_UUCP = 8<<3;
/** clock daemon */
final static public int LOG_CRON = 9<<3;
- /** security/authorization messages (private) */
+ /** authorization messages (private) */
final static public int LOG_AUTHPRIV = 10<<3;
/** ftp daemon */
final static public int LOG_FTP = 11<<3;

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/syslog/src/main/net/dpml/logging/logkit/syslog/SyslogTargetFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/syslog/src/main/net/dpml/logging/logkit/syslog/SyslogTargetFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/plugins/syslog/src/main/net/dpml/logging/logkit/syslog/SyslogTargetFactory.java
Sun Jun 12 09:47:29 2005
@@ -53,7 +53,7 @@
* wraps the format to output the log.
* </p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class SyslogTargetFactory implements LogTargetFactory

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test/DefaultLoggingManagerTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test/DefaultLoggingManagerTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test/DefaultLoggingManagerTestCase.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
/**
*
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultLoggingManagerTestCase extends TestCase

Modified:
development/laboratory/users/niclas/osgi/logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test/LoggingManagerHelper.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test/LoggingManagerHelper.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test/LoggingManagerHelper.java
Sun Jun 12 09:47:29 2005
@@ -32,7 +32,7 @@
/**
*
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class LoggingManagerHelper

Modified:
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/ConsoleLogger.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/ConsoleLogger.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/ConsoleLogger.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* This is mainly for the cases when you have a utility that
* does not have a logger to supply.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ConsoleLogger

Modified:
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingCriteria.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingCriteria.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingCriteria.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@
* a set of operations that enable easy manipulation of the logging
* system parameters.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface LoggingCriteria extends Map

Modified:
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingException.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a logging management related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class LoggingException

Modified:
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingFactory.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
/**
* Convinience interface to construct a logging manager.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface LoggingFactory extends Factory

Modified:
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingManager.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingManager.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingManager.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@

/**
* A <code>LoggerManager</code> that supports the management of a logging
hierarchy.
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface LoggingManager
@@ -31,7 +31,7 @@
/**
* Standard context key for the logging manager.
*/
- String KEY = "urn:avalon:logging.manager";
+ String KEY = "urn:metro:logging.manager";

/**
* Add a set of category entries using the supplied categories
descriptor.

Modified:
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingRuntimeException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingRuntimeException.java
(original)
+++
development/laboratory/users/niclas/osgi/logging/spi/src/main/net/dpml/logging/provider/LoggingRuntimeException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a logging management related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class LoggingRuntimeException

Modified:
development/laboratory/users/niclas/osgi/main/src/main/net/dpml/metro/Metro.java
==============================================================================
---
development/laboratory/users/niclas/osgi/main/src/main/net/dpml/metro/Metro.java
(original)
+++
development/laboratory/users/niclas/osgi/main/src/main/net/dpml/metro/Metro.java
Sun Jun 12 09:47:29 2005
@@ -78,7 +78,7 @@
* deals with the parameterization of a series of stacked plugins based on
* supplied command line arguments.
*
- * @author <a href="mailto:dev@dpmlnet";>Stephen J. McConnell</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class Metro implements Runnable
@@ -252,22 +252,7 @@

private ClassLoader getRootClassLoader( CommandLine line ) throws
IOException
{
- if( line.hasOption( "Xavalon" ) )
- {
- getLogger().debug( "including avalon apis" );
-
- URL[] urls = new URL[]
- {
- new URL(
"artifact:jar:avalon-framework/avalon-framework-api#4.2.0" ),
- new
URL("artifact:jar:avalon/util/avalon-util-lifecycle#1.1.1" )
- };
-
- return new URLClassLoader( urls,
SystemContext.class.getClassLoader() );
- }
- else
- {
- return SystemContext.class.getClassLoader();
- }
+ return SystemContext.class.getClassLoader();
}

private boolean getServerMode( CommandLine line )
@@ -502,13 +487,6 @@
options.addOptionGroup( server );

//
- // avalon switch
- //
-
- options.addOption(
- new Option( "Xavalon", REZ.getString( "cli-avalon-description" ) )
);
-
- //
// other
//


Modified:
development/laboratory/users/niclas/osgi/main/src/main/net/dpml/metro/Resources.properties
==============================================================================
---
development/laboratory/users/niclas/osgi/main/src/main/net/dpml/metro/Resources.properties
(original)
+++
development/laboratory/users/niclas/osgi/main/src/main/net/dpml/metro/Resources.properties
Sun Jun 12 09:47:29 2005
@@ -13,4 +13,4 @@

cli-server-description=Run the controller as a server (default)
cli-execute-description=On completion of deployment initiate a shutdown.
-cli-avalon-description=Include the avalon component api in the root
container classloader.
+cli-metro-description=Include the metro component api in the root container
classloader.

Modified: development/laboratory/users/niclas/osgi/meta/api/build.xml
==============================================================================
--- development/laboratory/users/niclas/osgi/meta/api/build.xml (original)
+++ development/laboratory/users/niclas/osgi/meta/api/build.xml Sun Jun 12
09:47:29 2005
@@ -3,6 +3,7 @@
<project name="dpml-meta-api" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit">

+ <property file="../../hacked.properties" />
<transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/CategoryDescriptor.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/CategoryDescriptor.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/CategoryDescriptor.java
Sun Jun 12 09:47:29 2005
@@ -24,9 +24,9 @@
import net.dpml.lang.NullArgumentException;

/**
- * A descriptor describing an Avalon Logger
+ * A descriptor describing a Logger
* child instances that the component will create using the
- * <code>org.apache.avalon.framework.logger.Logger#getChildLogger</code>
+ * <code>net.dpml.logging.Logger#getChildLogger</code>
* method. The name of each category is relative to the component. For
* example, a component with an internal logging category named "data"
* would aquire a logger for that category using the
@@ -38,7 +38,7 @@
* attributes that can be used to store extra information
* about Logger requirements.</p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class CategoryDescriptor

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/ContextDescriptor.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/ContextDescriptor.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/ContextDescriptor.java
Sun Jun 12 09:47:29 2005
@@ -40,7 +40,7 @@
* attributes that can be used to store extra information
* about Context requirements.</p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ContextDescriptor extends Descriptor

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/DependencyDescriptor.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/DependencyDescriptor.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/DependencyDescriptor.java
Sun Jun 12 09:47:29 2005
@@ -45,7 +45,7 @@
* it is persistent etc. These are all container specific
* demands.</p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class DependencyDescriptor extends Descriptor

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/Descriptor.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/Descriptor.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/Descriptor.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
/**
* This is the Abstract class for all feature feature descriptors.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public abstract class Descriptor

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/EntryDescriptor.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/EntryDescriptor.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/EntryDescriptor.java
Sun Jun 12 09:47:29 2005
@@ -32,7 +32,7 @@
* <li>isOptional: true if entry is optional rather than required</li>
* </ul>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class EntryDescriptor

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/InfoDescriptor.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/InfoDescriptor.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/InfoDescriptor.java
Sun Jun 12 09:47:29 2005
@@ -40,7 +40,7 @@
* The attributes should be stored with keys based on package
* name of container.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class InfoDescriptor extends Descriptor
@@ -105,12 +105,6 @@
*/
private final int m_collection;

- /**
- * Flag indicating if this is a native metro descriptor or avalon
descriptor.
- * TODO: change this to a versioned service protocol spec
- */
- private final boolean m_native;
-
//-------------------------------------------------------------------
// constructor
//-------------------------------------------------------------------
@@ -125,7 +119,6 @@
* @param lifestyle the component lifestyle (singleton, per-thread, etc.)
* @param collection the garbage collection policy for the component
* @param schema the configuration schema
- * @param flag native matro flag
* @param attributes a set of attributes associated with the component
type
* @exception IllegalArgumentException if the implementation key is not
a classname
* @exception NullArgumentException if the classname argument is null.
@@ -137,14 +130,10 @@
final String lifestyle,
final String collection,
final String schema,
- final boolean flag,
final Properties attributes )
throws IllegalArgumentException, NullArgumentException
{
super( attributes );
-
- m_native = flag;
-
if ( null == classname )
{
throw new NullArgumentException( "classname" );
@@ -331,16 +320,6 @@
}

/**
- * Ruturn TRUE is this is a native descriptor else FALSE.
- *
- * @return the native status
- */
- public boolean isNative()
- {
- return m_native;
- }
-
- /**
* Return a string representation of the info descriptor.
* @return the stringified type
*/
@@ -360,7 +339,6 @@
if (isEqual)
{
InfoDescriptor info = (InfoDescriptor)other;
- isEqual = isEqual && m_native == info.m_native;
isEqual = isEqual && m_classname.equals( info.m_classname );
isEqual = isEqual && ( m_collection == info.m_collection );
isEqual = isEqual && m_name.equals( info.m_name );
@@ -387,14 +365,6 @@
{
int hash = super.hashCode();

- if( m_native )
- {
- hash = hash + 818972391;
- }
- else
- {
- hash = hash - 293741397;
- }
hash ^= m_classname.hashCode();
if ( null != m_name )
{

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/ReferenceDescriptor.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/ReferenceDescriptor.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/ReferenceDescriptor.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,7 @@
* classname is a version object so that different versions of same
* interface can be represented.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ReferenceDescriptor

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/Service.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/Service.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/Service.java
Sun Jun 12 09:47:29 2005
@@ -27,7 +27,7 @@
* This class contains the meta information about a particular
* service. It contains a set of attributes qualifying the service;
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class Service extends Descriptor

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/ServiceDescriptor.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/ServiceDescriptor.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/ServiceDescriptor.java
Sun Jun 12 09:47:29 2005
@@ -37,11 +37,11 @@
*
* <p>Possible uses for the attributes are to declare a service
* as "stateless", "pass-by-value", "remotable" or even to attach
- * attributes such as security or transaction constraints. These
+ * attributes such as authentication or transaction constraints. These
* attributes are container specific and should not be relied
* upon to work in all containers.</p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ServiceDescriptor

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/Type.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/Type.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/Type.java
Sun Jun 12 09:47:29 2005
@@ -38,31 +38,27 @@
* <li>the services that this component type is capable of providing</li>
* <li>the services that this component type requires to operate (and the
* names via which services are accessed)</li>
- * <li>extended lifecycle stages that this component uses</li>
* </ul>
*
* <p><b>UML</b></p>
* <p><image src="doc-files/Type.gif" border="0"/></p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class Type implements Serializable
{
private final InfoDescriptor m_descriptor;
- private final SecurityDescriptor m_security;
private final ContextDescriptor m_context;
private final Configuration m_configuration;
private final ServiceDescriptor[] m_services;
private final DependencyDescriptor[] m_dependencies;
private final CategoryDescriptor[] m_loggers;
- private final StageDescriptor[] m_stages;
- private final ExtensionDescriptor[] m_extensions;
private final Parameters m_parameters;

/**
* Creation of a new Type instance using a supplied component descriptor,
- * logging, cotext, services, depedencies, stages and extension
descriptors.
+ * logging, context, services, depedencies
* @param descriptor a component descriprot that contains information
about
* the component type
* @param loggers a set of logger descriptors the declare the logging
channels
@@ -73,69 +69,25 @@
* this component type is capable of supplying
* @param dependencies a set of depedency descriptors that detail the
service
* that this component type is depedent on
- * @param stages a set of stage descriprors that detail the extension
stage
- * interfaces that this component requires a handler for
- * @param extensions a set of lifecycle extension capabilities that this
- * componet can provide to its container during the process of stage
- * suppier resolution
- * @exception NullPointerException if the descriptor, loggers, context,
services,
- * dependencies, stages, or extensions argument is null
+ * @exception NullPointerException if the descriptor, loggers, context,
services
+ * or dependencies argument is null
* @since 1.1
*/
public Type( final InfoDescriptor descriptor,
final CategoryDescriptor[] loggers,
final ContextDescriptor context,
final ServiceDescriptor[] services,
- final DependencyDescriptor[] dependencies,
- final StageDescriptor[] stages,
- final ExtensionDescriptor[] extensions )
+ final DependencyDescriptor[] dependencies )
throws NullPointerException
{
- this( descriptor, loggers, context, services, dependencies, stages,
extensions, null );
+ this( descriptor, loggers, context, services, dependencies, null );
}

/**
* Creation of a new Type instance using a supplied component descriptor,
- * logging, cotext, services, depedencies, stages and extension
descriptors.
- * @param descriptor a component descriprot that contains information
about
- * the component type
- * @param loggers a set of logger descriptors the declare the logging
channels
- * required by the type
- * @param context a component context descriptor that declares the
context type
- * and context entry key and value classnames
- * @param services a set of service descriprors that detail the service
that
- * this component type is capable of supplying
- * @param dependencies a set of depedency descriprors that detail the
service
- * that this component type is depedent on
- * @param stages a set of stage descriprors that detail the extensiuon
stage
- * interfaces that this component requires a handler for
- * @param extensions a set of lifecycle extension capabilities that this
- * componet can provide to its container during the process of stage
- * suppier resolution
- * @exception NullPointerException if the descriptor, loggers, context,
services,
- * dependencies, stages, or extensions argument is null
- */
- public Type( final InfoDescriptor descriptor,
- final CategoryDescriptor[] loggers,
- final ContextDescriptor context,
- final ServiceDescriptor[] services,
- final DependencyDescriptor[] dependencies,
- final StageDescriptor[] stages,
- final ExtensionDescriptor[] extensions,
- final Configuration defaults )
- throws NullPointerException
- {
- this(
- descriptor, new SecurityDescriptor( null, null ), loggers,
context, services, dependencies,
- stages, extensions, defaults );
- }
-
- /**
- * Creation of a new Type instance using a supplied component descriptor,
- * logging, cotext, services, depedencies, stages and extension
descriptors.
+ * logging, cotext, services and depedencies descriptors.
* @param descriptor a component descriptor that contains information
about
* the component type
- * @param security a component security descriptor
* @param loggers a set of logger descriptors the declare the logging
channels
* required by the type
* @param context a component context descriptor that declares the
context type
@@ -144,36 +96,26 @@
* this component type is capable of supplying
* @param dependencies a set of depedency descriprors that detail the
service
* that this component type is depedent on
- * @param stages a set of stage descriprors that detail the extensiuon
stage
- * interfaces that this component requires a handler for
- * @param extensions a set of lifecycle extension capabilities that this
- * componet can provide to its container during the process of stage
- * suppier resolution
- * @exception NullPointerException if the descriptor, loggers, context,
services,
- * dependencies, stages, or extensions argument is null
+ * @exception NullPointerException if the descriptor, loggers, context,
services
+ * or dependencies extensions argument is null
*/
public Type( final InfoDescriptor descriptor,
- final SecurityDescriptor security,
final CategoryDescriptor[] loggers,
final ContextDescriptor context,
final ServiceDescriptor[] services,
final DependencyDescriptor[] dependencies,
- final StageDescriptor[] stages,
- final ExtensionDescriptor[] extensions,
final Configuration defaults )
throws NullPointerException
{
- this(
- descriptor, security, loggers, context, services, dependencies,
- stages, extensions, defaults, null );
+ this( descriptor, loggers, context, services, dependencies,
+ defaults, null );
}

/**
* Creation of a new Type instance using a supplied component descriptor,
- * logging, cotext, services, depedencies, stages and extension
descriptors.
+ * logging, cotext, services and depedencies descriptors.
* @param descriptor a component descriptor that contains information
about
* the component type
- * @param security a component security descriptor
* @param loggers a set of logger descriptors the declare the logging
channels
* required by the type
* @param context a component context descriptor that declares the
context type
@@ -182,24 +124,16 @@
* this component type is capable of supplying
* @param dependencies a set of depedency descriprors that detail the
service
* that this component type is depedent on
- * @param stages a set of stage descriprors that detail the extensiuon
stage
- * interfaces that this component requires a handler for
- * @param extensions a set of lifecycle extension capabilities that this
- * componet can provide to its container during the process of stage
- * suppier resolution
* @param defaults the static configuration defaults
* @param params static parameter defaults
- * @exception NullArgumentException if the descriptor, loggers, context,
services,
- * dependencies, stages, or extensions argument is null
+ * @exception NullArgumentException if the descriptor, loggers, context,
services
+ * or dependencies argument is null
*/
public Type( final InfoDescriptor descriptor,
- final SecurityDescriptor security,
final CategoryDescriptor[] loggers,
final ContextDescriptor context,
final ServiceDescriptor[] services,
final DependencyDescriptor[] dependencies,
- final StageDescriptor[] stages,
- final ExtensionDescriptor[] extensions,
final Configuration defaults,
final Parameters params )
throws NullArgumentException
@@ -208,10 +142,6 @@
{
throw new NullArgumentException( "descriptor" );
}
- if ( null == security )
- {
- throw new NullArgumentException( "security" );
- }
if ( null == loggers )
{
throw new NullArgumentException( "loggers" );
@@ -228,23 +158,12 @@
{
throw new NullArgumentException( "dependencies" );
}
- if ( null == stages )
- {
- throw new NullArgumentException( "stages" );
- }
- if ( null == extensions )
- {
- throw new NullArgumentException( "extensions" );
- }

m_descriptor = descriptor;
- m_security = security;
m_loggers = loggers;
m_context = context;
m_services = services;
m_dependencies = dependencies;
- m_stages = stages;
- m_extensions = extensions;
m_configuration = defaults;
m_parameters = params;
}
@@ -260,16 +179,6 @@
}

/**
- * Return the security descriptor
- *
- * @return the security descriptor.
- */
- public SecurityDescriptor getSecurity()
- {
- return m_security;
- }
-
- /**
* Return the set of Logger that this Component will use.
*
* @return the set of Logger that this Component will use.
@@ -406,59 +315,6 @@
return m_parameters;
}

-
- /**
- * Return the lifecycle stages extensions required by this component
type.
- *
- * @return an array of stage descriptors.
- */
- public StageDescriptor[] getStages()
- {
- return m_stages;
- }
-
- /**
- * Return the stages extension handling provided by this extension.
- *
- * @return an array of extension descriptors.
- */
- public ExtensionDescriptor[] getExtensions()
- {
- return m_extensions;
- }
-
- /**
- * Return the extension supporting the supplied stage.
- *
- * @param stage the lifecycle stage that this type requires a handler for
- * @return a matching extension or null if no matching extension
- */
- public ExtensionDescriptor getExtension( StageDescriptor stage )
- {
- return getExtension( stage.getKey() );
- }
-
- /**
- * Return the extension supporting the supplied stage.
- *
- * @param key the lifecycle stage that this type requires a handler for
- * @return a matching extension or null if no matching extension
- */
- public ExtensionDescriptor getExtension( String key )
- {
- ExtensionDescriptor[] extensions = getExtensions();
- for ( int i = 0; i < extensions.length; i++ )
- {
- ExtensionDescriptor extension = extensions[i];
- String ref = extension.getKey();
- if ( key.equals( ref ) )
- {
- return extension;
- }
- }
- return null;
- }
-
/**
* Return a string representation of the type.
* @return the stringified type
@@ -485,9 +341,6 @@
if( ! m_descriptor.equals( t.m_descriptor ) )
return false;

- if( ! m_security.equals( t.m_security ) )
- return false;
-
if( null == m_configuration )
{
if( ! ( null == t.m_configuration ) )
@@ -528,16 +381,6 @@
if( ! m_dependencies[i].equals( t.m_dependencies[i] ) )
return false;
}
- for( int i=0; i<m_stages.length; i++ )
- {
- if( ! m_stages[i].equals( t.m_stages[i] ) )
- return false;
- }
- for( int i=0; i<m_extensions.length; i++ )
- {
- if( ! m_extensions[i].equals( t.m_extensions[i] ) )
- return false;
- }
return true;
}

@@ -548,7 +391,6 @@
public int hashCode()
{
int hash = m_descriptor.hashCode();
- hash ^= m_security.hashCode();
hash ^= m_context.hashCode();

if( m_configuration != null )
@@ -576,16 +418,6 @@
hash ^= m_loggers[i].hashCode();
hash = hash + 471312761;
}
- for( int i=0; i<m_stages.length; i++ )
- {
- hash ^= m_stages[i].hashCode();
- hash = hash + 71371219;
- }
- for( int i=0; i<m_extensions.length; i++ )
- {
- hash ^= m_extensions[i].hashCode();
- hash = hash - 13712377;
- }
return hash;
}
}

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/Version.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/Version.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/info/Version.java
Sun Jun 12 09:47:29 2005
@@ -51,7 +51,7 @@
* </li>
* </ul>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class Version

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/package.html
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/package.html
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/package.html
Sun Jun 12 09:47:29 2005
@@ -1,8 +1,7 @@

<body>
<p>
-Generic build resources related to meta content generation. See
-<a
href="http://avalon.apache.org/avalon/meta/";>http://avalon.apache.org/avalon/meta/</a>
+Generic build resources related to meta content generation.</a>
for more information.
</p>
</body>

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/type.dtd
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/type.dtd
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/main/net/dpml/meta/type.dtd
Sun Jun 12 09:47:29 2005
@@ -1,217 +1,183 @@
-<!--
-
- This is the DTD defining the DPML Meta Model Type 1.0
- descriptor (XML) file format/syntax.
-
- An xinfo file is an XML file used to describe component types and is
located side-by-side with
- the .class file of the component. It describes the services the component
requires to operate
- (its dependecies), the services the component is capable of offerring
other component, the
- context entrys that component requires, logging catagories that the
compoent may use, stage
- depedencies, supplied extension haddlers, and management control points
and other support meta
- data in the form of attributes.
-
- * Copyright 2004-2005 The Digital Product Meta Library
- * Copyright 1999-2004 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.
-
- -->
-
-<!--
-A type element is the document root, it defines:
-
-info the specific details about this component type
-loggers the loggers used by this component type
-context the context required by this component type
-services the services offered by this component type
-dependencies the services that this component type require to operate
-stages the lifecycle stage extensions that this component type is
depenent on
-extensions the lifecycle extensions that this component type provides
-
--->
-
-<!ELEMENT type ( info, loggers?, context?, services?, dependencies?,
stages?, extensions?)>
-
-<!--
-The info element describes the component, it defines:
-
-name the human readable name of component type. Must be a string
- containing alphanumeric characters, '.', '_' and starting
- with a letter.
-version the version of the component in (in the format #.#.#,
#.# or # where
- # is a integer
--->
-<!ELEMENT info (name?,version,lifestyle?,attributes?)>
- <!ELEMENT name (#PCDATA) >
- <!ELEMENT version (#PCDATA) >
- <!ELEMENT lifestyle (#PCDATA) >
-
-
-<!--
-The component element describes the component, it defines:
-
-name the human readable name of component type. Must be a string
- containing alphanumeric characters, '.', '_' and starting
- with a letter.
-version the version of the component in (in the format #.#.#,
#.# or # where
- # is a integer
-
-This is a deprecated element - use "info" instead.
--->
-<!ELEMENT component (name?,version,attributes?)>
- <!ELEMENT name (#PCDATA) >
- <!ELEMENT version (#PCDATA) >
-
-<!--
-The logger element defines the loggers that are available to component.
-The element has one attribute specifying name of Logger. It contains:
-
-attributes Optional attributes about logger
--->
-<!ELEMENT logger (attributes?) >
- <!ATTLIST logger name CDATA #IMPLIED >
-
-<!--
-The context element defines what values and type of context
-is available to component.
-It contains:
-
-entrys Key value pairs that component uses
-attributes Optional attributes about service
--->
-<!ELEMENT context (entry*,attributes?) >
- <!ATTLIST context type CDATA #IMPLIED >
-
-<!--
-The service element defines a service that the component
-can provide to other component.
-It contains:
-
-reference the reference to service.
-attributes Optional attributes about service
--->
-<!ENTITY % ref "(reference)">
-<!ELEMENT service (%ref;,attributes?) >
-
-<!--
-The reference element defines a reference to a versioned interface.
-It defines:
-
-type the class of the interface. This must be equal to the class
name of the
- interface.
-version the version of the interface in (in the format #.#.#, #.# or
# where
- # is a integer
--->
-<!ELEMENT reference EMPTY >
- <!ATTLIST reference
- type CDATA #REQUIRED
- version CDATA #IMPLIED >
-
-<!--
-The extension element defines a lifecycle extension stage supplied by a type:
-
-name the extension name.
-reference the version lifecycle interface supported
-attributes Optional attributes about the extension
--->
-<!ENTITY % stage.attribute "stage
(CREATE|ACCESS|RELEASE|DESTROY|ALL|INNER|OUTER) 'ALL'">
-<!ELEMENT extension (name,reference,attributes?)>
-<!ATTLIST extension
- %stage.attribute; >
-
-<!--
-The stage element defines a lifecycle extension stage that this component is
dependent on.
-It contains:
-
-name the stage name.
-interface the client stage interface
-attributes Optional attributes about the stage
--->
-<!ELEMENT stage (reference,attributes?)>
-
-<!--
-The stages element contains a list of stages that this component is
dependent on.
-It contains stage elements.
--->
-<!ELEMENT stages (stage*)>
-
-<!--
-The extensions element contains a list of extensions that the component
provides.
--->
-<!ELEMENT extensions (extension*)>
-
-<!--
-The service dependency describes a service that the component
-requires. It defines:
-
-role the role of the service. This is the value that is used to
lookup the
- service in the ComponentManager. If not provided it defaults to
the
- value specified in the name attribute of service element
-service-ref the service that is required
--->
-<!ELEMENT dependency (role?,%ref;,attributes?) >
- <!ATTLIST dependency optional CDATA #IMPLIED >
- <!ELEMENT role (#PCDATA) >
-
-
-<!--
-The loggers element contains a list of loggers that component uses.
--->
-<!ELEMENT loggers (logger*)>
-
-<!--
-The services element contains a list of services that this component
supports.
-It contains service elements.
--->
-<!ELEMENT services (service*)>
-
-<!--
-The dependencies element contains a list of services that this component
requires.
-It contains dependency elements.
--->
-<!ELEMENT dependencies (dependency*)>
-
-<!--
-The attributes element contains a list of attributes for feature.
--->
-<!ELEMENT attributes (attribute*)>
-
-<!--
-The attribute element defines an attribute (an opaque key-value pair for a
feature).
-It defines:
-
-key the key for attribute.
-value the value of attribute.
--->
-<!ELEMENT attribute (#PCDATA) >
- <!ATTLIST attribute
- key CDATA #REQUIRED
- value CDATA #IMPLIED
- >
-
-<!--
-The entry element defines entry in context.
-It defines:
-
-key the key for entry.
-type the type of entry.
-optional is entry optional
--->
-<!ELEMENT entry EMPTY >
- <!ATTLIST entry
- key CDATA #REQUIRED
- type CDATA #REQUIRED
- optional CDATA #IMPLIED
- >
+<!--
+
+ This is the DTD defining the DPML Meta Model Type 1.0
+ descriptor (XML) file format/syntax.
+
+ An xinfo file is an XML file used to describe component types and is
located side-by-side with
+ the .class file of the component. It describes the services the component
requires to operate
+ (its dependecies), the services the component is capable of offerring
other component, the
+ context entrys that component requires, logging catagories that the
compoent may use
+ and management control points and other support meta
+ data in the form of attributes.
+
+ * Copyright 2004-2005 The Digital Product Meta Library
+ * Copyright 1999-2004 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.
+
+ -->
+
+<!--
+A type element is the document root, it defines:
+
+info the specific details about this component type
+loggers the loggers used by this component type
+context the context required by this component type
+services the services offered by this component type
+dependencies the services that this component type require to operate
+
+-->
+
+<!ELEMENT type ( info, loggers?, context?, services?, dependencies? )>
+
+<!--
+The info element describes the component, it defines:
+
+name the human readable name of component type. Must be a string
+ containing alphanumeric characters, '.', '_' and starting
+ with a letter.
+version the version of the component in (in the format #.#.#,
#.# or # where
+ # is a integer
+-->
+<!ELEMENT info (name?,version,lifestyle?,attributes?)>
+ <!ELEMENT name (#PCDATA) >
+ <!ELEMENT version (#PCDATA) >
+ <!ELEMENT lifestyle (#PCDATA) >
+
+
+<!--
+The component element describes the component, it defines:
+
+name the human readable name of component type. Must be a string
+ containing alphanumeric characters, '.', '_' and starting
+ with a letter.
+version the version of the component in (in the format #.#.#,
#.# or # where
+ # is a integer
+
+This is a deprecated element - use "info" instead.
+-->
+<!ELEMENT component (name?,version,attributes?)>
+ <!ELEMENT name (#PCDATA) >
+ <!ELEMENT version (#PCDATA) >
+
+<!--
+The logger element defines the loggers that are available to component.
+The element has one attribute specifying name of Logger. It contains:
+
+attributes Optional attributes about logger
+-->
+<!ELEMENT logger (attributes?) >
+ <!ATTLIST logger name CDATA #IMPLIED >
+
+<!--
+The context element defines what values and type of context
+is available to component.
+It contains:
+
+entrys Key value pairs that component uses
+attributes Optional attributes about service
+-->
+<!ELEMENT context (entry*,attributes?) >
+ <!ATTLIST context type CDATA #IMPLIED >
+
+<!--
+The service element defines a service that the component
+can provide to other component.
+It contains:
+
+reference the reference to service.
+attributes Optional attributes about service
+-->
+<!ENTITY % ref "(reference)">
+<!ELEMENT service (%ref;,attributes?) >
+
+<!--
+The reference element defines a reference to a versioned interface.
+It defines:
+
+type the class of the interface. This must be equal to the class
name of the
+ interface.
+version the version of the interface in (in the format #.#.#, #.# or
# where
+ # is a integer
+-->
+<!ELEMENT reference EMPTY >
+ <!ATTLIST reference
+ type CDATA #REQUIRED
+ version CDATA #IMPLIED >
+
+
+<!--
+The service dependency describes a service that the component
+requires. It defines:
+
+role the role of the service. This is the value that is used to
lookup the
+ service in the ComponentManager. If not provided it defaults to
the
+ value specified in the name attribute of service element
+service-ref the service that is required
+-->
+<!ELEMENT dependency (role?,%ref;,attributes?) >
+ <!ATTLIST dependency optional CDATA #IMPLIED >
+ <!ELEMENT role (#PCDATA) >
+
+
+<!--
+The loggers element contains a list of loggers that component uses.
+-->
+<!ELEMENT loggers (logger*)>
+
+<!--
+The services element contains a list of services that this component
supports.
+It contains service elements.
+-->
+<!ELEMENT services (service*)>
+
+<!--
+The dependencies element contains a list of services that this component
requires.
+It contains dependency elements.
+-->
+<!ELEMENT dependencies (dependency*)>
+
+<!--
+The attributes element contains a list of attributes for feature.
+-->
+<!ELEMENT attributes (attribute*)>
+
+<!--
+The attribute element defines an attribute (an opaque key-value pair for a
feature).
+It defines:
+
+key the key for attribute.
+value the value of attribute.
+-->
+<!ELEMENT attribute (#PCDATA) >
+ <!ATTLIST attribute
+ key CDATA #REQUIRED
+ value CDATA #IMPLIED
+ >
+
+<!--
+The entry element defines entry in context.
+It defines:
+
+key the key for entry.
+type the type of entry.
+optional is entry optional
+-->
+<!ELEMENT entry EMPTY >
+ <!ATTLIST entry
+ key CDATA #REQUIRED
+ type CDATA #REQUIRED
+ optional CDATA #IMPLIED
+ >

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/AbstractDescriptorTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/AbstractDescriptorTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/AbstractDescriptorTestCase.java
Sun Jun 12 09:47:29 2005
@@ -34,7 +34,7 @@
/**
* AbstractDescriptorTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public abstract class AbstractDescriptorTestCase extends TestCase

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/CategoryDescriptorTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/CategoryDescriptorTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/CategoryDescriptorTestCase.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
/**
* CategoryTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class CategoryDescriptorTestCase extends AbstractDescriptorTestCase

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ContextDescriptorTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ContextDescriptorTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ContextDescriptorTestCase.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
/**
* ContextDescriptorTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ContextDescriptorTestCase extends AbstractDescriptorTestCase
@@ -94,7 +94,7 @@

public void setUp()
{
- m_classname = "org.apache.avalon.playground.MyContext";
+ m_classname = "net.dpml.playground.MyContext";
m_entries = new EntryDescriptor[]{
new EntryDescriptor( "key", String.class.getName() )
};

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/DependencyDescriptorTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/DependencyDescriptorTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/DependencyDescriptorTestCase.java
Sun Jun 12 09:47:29 2005
@@ -27,7 +27,7 @@
/**
* DependencyDescriptorTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DependencyDescriptorTestCase extends AbstractDescriptorTestCase

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/EntryDescriptorTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/EntryDescriptorTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/EntryDescriptorTestCase.java
Sun Jun 12 09:47:29 2005
@@ -35,7 +35,7 @@
/**
* EntryDescriptorTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class EntryDescriptorTestCase extends TestCase

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/InfoDescriptorTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/InfoDescriptorTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/InfoDescriptorTestCase.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
/**
* InfoDescriptorTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class InfoDescriptorTestCase extends AbstractDescriptorTestCase
@@ -39,7 +39,6 @@
private final String m_lifestyle = InfoDescriptor.SINGLETON;
private final String m_collection = InfoDescriptor.WEAK_KEY;
private final String m_schema = "schema";
- private final boolean m_native = true;

public InfoDescriptorTestCase ( String name )
{
@@ -49,7 +48,7 @@
protected Descriptor getDescriptor()
{
return new InfoDescriptor(
- m_name, m_classname, m_version, m_lifestyle, m_collection,
m_schema, m_native, getProperties());
+ m_name, m_classname, m_version, m_lifestyle, m_collection,
m_schema, getProperties());
}

protected void checkDescriptor( Descriptor desc )
@@ -69,7 +68,7 @@
try
{
new InfoDescriptor(
- m_name, null, m_version, m_lifestyle, m_collection, m_schema,
m_native, getProperties() );
+ m_name, null, m_version, m_lifestyle, m_collection, m_schema,
getProperties() );
fail("Did not throw the proper NullPointerException");
}
catch( NullArgumentException npe )
@@ -81,7 +80,7 @@
{
new InfoDescriptor(
m_name, "foo/fake/ClassName", m_version, m_lifestyle,
m_collection,
- m_schema, m_native, getProperties());
+ m_schema, getProperties());
fail("Did not throw the proper IllegalArgumentException");
}
catch( IllegalArgumentException iae )
@@ -93,19 +92,19 @@
{
new InfoDescriptor(
m_name, m_classname, m_version, InfoDescriptor.SINGLETON,
m_collection,
- m_schema, m_native, getProperties() );
+ m_schema, getProperties() );
new InfoDescriptor(
m_name, m_classname, m_version, InfoDescriptor.THREAD,
m_collection,
- m_schema, m_native, getProperties() );
+ m_schema, getProperties() );
new InfoDescriptor(
m_name, m_classname, m_version, InfoDescriptor.TRANSIENT,
m_collection,
- m_schema, m_native, getProperties() );
+ m_schema, getProperties() );

// All these should pass.

new InfoDescriptor(
m_name, m_classname, m_version, "Fake Lifestyle", m_collection,
- m_schema, m_native, getProperties() );
+ m_schema, getProperties() );

fail( "Did not throw the proper IllegalArgumentException" );
}

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ReferenceDescriptorTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ReferenceDescriptorTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ReferenceDescriptorTestCase.java
Sun Jun 12 09:47:29 2005
@@ -37,7 +37,7 @@
/**
* ReferenceDescriptorTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ReferenceDescriptorTestCase extends TestCase

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ServiceDescriptorTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ServiceDescriptorTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ServiceDescriptorTestCase.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@
/**
* ServiceDescriptorTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ServiceDescriptorTestCase extends AbstractDescriptorTestCase

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ServiceTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ServiceTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/ServiceTestCase.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,7 @@
/**
* ServiceTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ServiceTestCase extends AbstractDescriptorTestCase

Modified:
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/TypeTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/TypeTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/api/src/test/net/dpml/meta/info/test/TypeTestCase.java
Sun Jun 12 09:47:29 2005
@@ -34,12 +34,9 @@
import net.dpml.meta.info.ContextDescriptor;
import net.dpml.meta.info.DependencyDescriptor;
import net.dpml.meta.info.EntryDescriptor;
-import net.dpml.meta.info.ExtensionDescriptor;
import net.dpml.meta.info.InfoDescriptor;
import net.dpml.meta.info.ReferenceDescriptor;
-import net.dpml.meta.info.SecurityDescriptor;
import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.StageDescriptor;
import net.dpml.meta.info.Type;

import net.dpml.configuration.Configuration;
@@ -54,19 +51,16 @@
/**
* TypeTestCase does XYZ
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class TypeTestCase extends TestCase
{
private InfoDescriptor m_descriptor;
- private SecurityDescriptor m_security;
private CategoryDescriptor[] m_loggers;
private ContextDescriptor m_context;
private ServiceDescriptor[] m_services;
private DependencyDescriptor[] m_dependencies;
- private StageDescriptor[] m_stages;
- private ExtensionDescriptor[] m_extensions;
private Configuration m_defaults;
private Parameters m_parameters;
private ReferenceDescriptor m_reference;
@@ -82,7 +76,6 @@
m_reference = new ReferenceDescriptor(TypeTestCase.class.getName());
m_key = TypeTestCase.class.getName();
m_descriptor = createSimpleInfo(TypeTestCase.class.getName());
- m_security = new SecurityDescriptor( null, null );
m_loggers = new CategoryDescriptor[] {
new CategoryDescriptor("name", new Properties())
};
@@ -94,12 +87,6 @@
m_dependencies = new DependencyDescriptor[] {
new DependencyDescriptor("role", m_reference)
};
- m_stages = new StageDescriptor[] {
- new StageDescriptor( m_key )
- };
- m_extensions = new ExtensionDescriptor[] {
- new ExtensionDescriptor( m_key )
- };
m_defaults = new DefaultConfiguration("default");
m_parameters = DefaultParameters.EMPTY_PARAMETERS;
}
@@ -108,19 +95,15 @@
{
assertNotNull(type);
checkArray(m_loggers, type.getCategories());
- assertEquals( m_security, type.getSecurity() );
assertEquals( m_defaults, type.getConfiguration() );
assertEquals( m_parameters , type.getParameters() );
assertEquals( m_context, type.getContext());
checkArray(m_dependencies, type.getDependencies());
assertEquals(m_dependencies[0],
type.getDependency(m_dependencies[0].getKey()));
- assertEquals(m_extensions[0], type.getExtension(
m_stages[0].getKey() ) );
- checkArray(m_extensions, type.getExtensions());
assertEquals( m_descriptor, type.getInfo() );
assertEquals( m_services[0], type.getService(m_reference));
assertEquals( m_services[0], type.getService(
m_services[0].getReference().getClassname()));
checkArray(m_services, type.getServices());
- checkArray(m_stages, type.getStages());
assertTrue(type.isaCategory(m_loggers[0].getName()));
assertTrue( !type.isaCategory( "fake name" ) );
}
@@ -138,8 +121,8 @@
{
Type type =
new Type(
- m_descriptor, m_security, m_loggers, m_context, m_services,
m_dependencies,
- m_stages, m_extensions, m_defaults, m_parameters );
+ m_descriptor, m_loggers, m_context, m_services, m_dependencies,
+ m_defaults, m_parameters );
checkType(type);
}

@@ -147,8 +130,8 @@
{
Type type =
new Type(
- m_descriptor, m_security, m_loggers, m_context, m_services,
m_dependencies,
- m_stages, m_extensions, m_defaults, m_parameters );
+ m_descriptor, m_loggers, m_context, m_services, m_dependencies,
+ m_defaults, m_parameters );

checkType( type );

@@ -171,6 +154,6 @@

private static InfoDescriptor createSimpleInfo( String classname )
{
- return new InfoDescriptor( null, classname, null, null, null, null,
true, null );
+ return new InfoDescriptor( null, classname, null, null, null, null,
null );
}
}

Modified:
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/Resources.properties
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/Resources.properties
(original)
+++
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/Resources.properties
Sun Jun 12 09:47:29 2005
@@ -7,7 +7,7 @@
builder.missing-xml-creator.error=Unable to create XMLTypeCreator, usually
due to non-availablity of XML classes on Classpath.

builder.creating-facility.notice=Creating a Facility from class "{0}".
-builder.created-facility.notice=Constructed Facility from class {0} with {1}
services, {2} dependencies, {3} context entries, {4} loggers, {5} extended
phases dependecies, and {6} phase extensions.
+builder.created-facility.notice=Constructed Facility from class {0} with {1}
services, {2} dependencies, {3} context entries and {4} loggers.

builder.creating-service.notice=Creating a Service from class "{0}".
builder.bad-toplevel-service-element.error=Error the service "{0}" has an
invalid element at top level service descriptor. Expected: "service". Actual:
"{1}"

Modified:
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/SerializedServiceCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/SerializedServiceCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/SerializedServiceCreator.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
/**
* Create {@link Service} from stream made up of a serialized object.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class SerializedServiceCreator

Modified:
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/SerializedTypeCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/SerializedTypeCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/SerializedTypeCreator.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,7 @@
* Create {@link Type} from stream made up of
* serialized object.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class SerializedTypeCreator

Modified:
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/ServiceBuilder.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/ServiceBuilder.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/ServiceBuilder.java
Sun Jun 12 09:47:29 2005
@@ -33,7 +33,7 @@
* <p><b>UML</b></p>
* <p><image src="doc-files/ServiceBuilder.gif" border="0"/></p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ServiceBuilder

Modified:
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/TypeBuilder.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/TypeBuilder.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/TypeBuilder.java
Sun Jun 12 09:47:29 2005
@@ -57,7 +57,7 @@
* <p><b>UML</b></p>
* <p><image src="doc-files/TypeBuilder.gif" border="0"/></p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class TypeBuilder
@@ -135,9 +135,8 @@
* will attempt to locate a &lt;classname&gt;.xtype resource. If
* not found, the implementation will attempt to locate
* a &lt;classname&gt;.info resource. Once a resource is established
- * the type will be resolved relative to the root element. Normally
- * the root element is a &lttype&gt;, however the implementation
- * also recognises the legacy &lt;blockinfo&gt; schema.
+ * the type will be resolved relative to the root element.
+ * The root element is a &lttype&gt;.
*
* @param clazz The class for Component
* @return the created Type
@@ -151,22 +150,8 @@

final TypeFactory xmlTypeFactory = getXMLTypeFactory();

- //
- // get the input stream for the .xtype resource
- //
-
- String path =
- classname.replace( '.', '/' ) + ".xtype";
- InputStream inputStream =
- classLoader.getResourceAsStream( path );
-
- if( null == inputStream )
- {
- path =
- classname.replace( '.', '/' ) + ".xinfo";
- inputStream =
- classLoader.getResourceAsStream( path );
- }
+ String path = classname.replace( '.', '/' ) + ".xinfo";
+ InputStream inputStream = classLoader.getResourceAsStream( path );

if( null == inputStream )
{
@@ -178,27 +163,22 @@
final InputSource inputSource = new InputSource( inputStream );
final Configuration xinfo = ConfigurationBuilder.build( inputSource
);

- final String xdefaults =
- classname.replace( '.', '/' ) + ".xconfig";
- final InputStream defaultsStream =
- classLoader.getResourceAsStream( xdefaults );
+ final String xdefaults = classname.replace( '.', '/' ) + ".xconfig";
+ final InputStream defaultsStream = classLoader.getResourceAsStream(
xdefaults );

Configuration defaults;
if( defaultsStream != null )
{
final InputSource defaultsSource = new InputSource(
defaultsStream );
- defaults = resolveConfiguration(
- classLoader, ConfigurationBuilder.build( defaultsSource ) );
+ defaults = resolveConfiguration( classLoader,
ConfigurationBuilder.build( defaultsSource ) );
}
else
{
defaults = new DefaultConfiguration( "configuration", (String)
null );
}

- final String xparams =
- classname.replace( '.', '/' ) + ".xparams";
- final InputStream paramsStream =
- classLoader.getResourceAsStream( xparams );
+ final String xparams = classname.replace( '.', '/' ) + ".xparams";
+ final InputStream paramsStream = classLoader.getResourceAsStream(
xparams );

Parameters params;
if( paramsStream != null )
@@ -211,10 +191,8 @@
}
catch( IOException ioe )
{
- final String error =
- "Unexpected exception while attempting to resolve
parameters from src: "
- + xparams;
- throw new ParameterException( error );
+ final String error = "Unexpected exception while attempting
to resolve parameters from src: " + xparams;
+ throw new ParameterException( error );
}
}
else
@@ -230,7 +208,7 @@
}

private Configuration resolveConfiguration( ClassLoader classloader,
Configuration config )
- throws Exception, NullArgumentException
+ throws Exception, NullArgumentException
{
if( config == null )
{

Modified:
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/XMLServiceCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/XMLServiceCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/XMLServiceCreator.java
Sun Jun 12 09:47:29 2005
@@ -50,7 +50,7 @@
* Utility class the handles the internalization of an XML description
* of a service into a {@link Service} instance.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class XMLServiceCreator

Modified:
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/XMLTypeCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/XMLTypeCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/builder/impl/XMLTypeCreator.java
Sun Jun 12 09:47:29 2005
@@ -39,13 +39,9 @@
import net.dpml.meta.info.ContextDescriptor;
import net.dpml.meta.info.DependencyDescriptor;
import net.dpml.meta.info.EntryDescriptor;
-import net.dpml.meta.info.ExtensionDescriptor;
import net.dpml.meta.info.CategoryDescriptor;
import net.dpml.meta.info.ReferenceDescriptor;
import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.StageDescriptor;
-import net.dpml.meta.info.SecurityDescriptor;
-import net.dpml.meta.info.PermissionDescriptor;
import net.dpml.meta.info.Type;

import net.dpml.meta.info.builder.BuildException;
@@ -62,11 +58,11 @@
* from a Configuration object. The format for Configuration object
* is specified in the <a href="package-summary.html#external">package
summary</a>.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
-public class XMLTypeCreator
- extends XMLServiceCreator implements TypeFactory
+public class XMLTypeCreator extends XMLServiceCreator
+ implements TypeFactory
{
private static final Resources REZ =
ResourceManager.getPackageResources( XMLTypeCreator.class );
@@ -130,11 +126,6 @@
{
final String topLevelName = info.getName();

- if( topLevelName.equals( "blockinfo" ) )
- {
- return new XMLLegacyCreator().createType( classname, info );
- }
-
if( !topLevelName.equals( "type" ) )
{
final String message =
@@ -156,10 +147,6 @@
final InfoDescriptor descriptor =
buildInfoDescriptor( classname, configuration );

- configuration = info.getChild( "security", false );
- final SecurityDescriptor security =
- buildSecurityDescriptor( configuration );
-
configuration = info.getChild( "loggers" );
final CategoryDescriptor[] loggers = buildLoggers( configuration );

@@ -173,71 +160,7 @@
final DependencyDescriptor[] dependencies =
buildDependencies( configuration );

- configuration = info.getChild( "stages" );
- final StageDescriptor[] phases = buildStages( configuration );
-
- configuration = info.getChild( "extensions" );
- final ExtensionDescriptor[] extensions = buildExtensions(
configuration );
-
- return new Type(
- descriptor, security, loggers, context, services, dependencies,
phases,
- extensions, defaults, params );
- }
-
- /**
- * Utility function to create a set of phase descriptor from a
configuration.
- * @param config a configuration containing 0..n phase elements
- * @return an array of phase descriptors
- * @exception BuildException if a build error occurs
- */
- protected StageDescriptor[] buildStages( Configuration config )
- throws BuildException
- {
- ArrayList list = new ArrayList();
- Configuration[] stages = config.getChildren( "stage" );
- for( int i = 0; i < stages.length; i++ )
- {
- StageDescriptor stage = buildPhase( stages[i] );
- list.add( stage );
- }
- return (StageDescriptor[])list.toArray( new StageDescriptor[ 0 ] );
- }
-
- /**
- * Utility function to create a set of phase descriptor from a
configuration.
- * @param config a configuration containing 0..n phase elements
- * @return an array of phase descriptors
- * @exception BuildException if a build error occurs
- */
- protected StageDescriptor buildPhase( Configuration config )
- throws BuildException
- {
-
- try
- {
- String id = null;
- if( config.getAttribute( "type", null ) != null ) // legacy
- {
- id = config.getAttribute( "type" );
- }
- else if( config.getAttribute( "key", null ) != null ) // legacy
- {
- id = config.getAttribute( "key" );
- }
-
- if( id == null ) id = config.getAttribute( "id" ); // standard
-
- final Properties attributes =
- buildAttributes( config.getChild( "attributes" ) );
- return new StageDescriptor( id, attributes );
- }
- catch( Throwable e )
- {
- final String error =
- "Unable to construct a stage descriptor from source fragment:"
- + ConfigurationUtil.list( config );
- throw new BuildException( error, e );
- }
+ return new Type( descriptor, loggers, context, services,
dependencies, defaults, params );
}

/**
@@ -357,11 +280,8 @@
protected DependencyDescriptor buildDependency( final Configuration
dependency )
throws BuildException
{
- String role = dependency.getAttribute( "role", null ); // legacy
- if( role == null )
- {
- role = dependency.getAttribute( "key", null );
- }
+ String role = dependency.getAttribute( "key", null );
+
ReferenceDescriptor reference =
buildReferenceDescriptor( dependency );

@@ -455,12 +375,9 @@
* @return the created InfoDescriptor
* @throws BuildException if an error occurs
*/
- public InfoDescriptor buildInfoDescriptor(
- final String classname, final Configuration info )
- throws BuildException
+ public InfoDescriptor buildInfoDescriptor( String classname,
Configuration info )
+ throws BuildException
{
- final boolean isNative = info.getAttributeAsBoolean( "native", false
);
-
final String name =
info.getChild( "name" ).getValue( null );
final Version version =
@@ -471,70 +388,10 @@
buildAttributes( info.getChild( "attributes" ) );
final String lifestyle =
buildLifestyle( info, attributes );
- final String collectionLegacy =
- info.getChild( "lifestyle" ).getAttribute( "collection", null );
final String collection =
- info.getChild( "collection" ).getValue( collectionLegacy );
+ info.getChild( "collection" ).getValue( null );

- return new InfoDescriptor(
- name, classname, version, lifestyle, collection, schema, isNative,
attributes );
- }
-
- /**
- * A utility method to build a {@link SecurityDescriptor}
- * object from specified configuration data.
- *
- * @param config the security configuration fragment
- * @return the created SecurityDescriptor
- * @throws BuildException if an error occurs
- */
- public SecurityDescriptor buildSecurityDescriptor( final Configuration
config )
- throws BuildException
- {
- if( null == config ) return new SecurityDescriptor( null, null );
-
- try
- {
- final Properties attributes =
- buildAttributes( config.getChild( "attributes" ) );
- PermissionDescriptor[] permissions = buildPermissions( config );
- return new SecurityDescriptor( permissions, attributes );
- }
- catch( ConfigurationException e )
- {
- final String error =
- "Cannot build secrity descriptor.";
- throw new BuildException( error, e );
- }
- }
-
- private PermissionDescriptor[] buildPermissions( final Configuration
config )
- throws ConfigurationException
- {
- ArrayList list = new ArrayList();
- Configuration[] children = config.getChildren( "permission" );
- for( int i = 0; i < children.length; i++ )
- {
- list.add( buildPermission( children[i] ) );
- }
- return (PermissionDescriptor[])list.toArray( new
PermissionDescriptor[ 0 ] );
- }
-
- private PermissionDescriptor buildPermission( final Configuration config
)
- throws ConfigurationException
- {
- final String classname = config.getAttribute( "class" );
- final String name = config.getAttribute( "name", null );
- ArrayList list = new ArrayList();
- Configuration[] children = config.getChildren( "action" );
- for( int i=0; i<children.length; i++ )
- {
- Configuration child = children[i];
- String action = child.getValue();
- list.add( action );
- }
- String[] actions = (String[])list.toArray( new String[0] );
- return new PermissionDescriptor( classname, name, actions );
+ return new InfoDescriptor( name, classname, version, lifestyle,
collection, schema, attributes );
}

/**
@@ -542,7 +399,7 @@
* resolved by retrieving the &lt;lifestyle&gt; element value, however,
for
* backward compatability - if the lifecycle element is not present, we
will
* attempt to resolve the lifestyle using the attribute value relative to
the
- * key urn:avalon:lifestyle.
+ * key urn:metro:lifestyle.
*
* @param info the info configuration fragment
* @param attributes the component attributes
@@ -557,64 +414,7 @@
}
else
{
- return attributes.getProperty( "urn:avalon:lifestyle" );
- }
- }
-
- /**
- * Utility function to create a set of phase descriptor from a
configuration.
- * @param config a configuration containing 0..n phase elements
- * @return an array of phase descriptors
- * @exception BuildException if a build error occurs
- */
- protected ExtensionDescriptor[] buildExtensions( Configuration config )
- throws BuildException
- {
- ArrayList list = new ArrayList();
- Configuration[] extensions = config.getChildren( "extension" );
- for( int i = 0; i < extensions.length; i++ )
- {
- list.add( buildExtension( extensions[i] ) );
- }
- return (ExtensionDescriptor[])list.toArray( new ExtensionDescriptor[
0 ] );
- }
-
- /**
- * Utility function to create an extension descriptor from a
configuration.
- * @param config a configuration containing the extension definition
- * @return the extension descriptor
- * @exception BuildException if a build error occurs
- */
- protected ExtensionDescriptor buildExtension( Configuration config )
- throws BuildException
- {
- if( config.getAttribute( "type", null ) != null ) // legacy
- {
- String urn = config.getAttribute( "type", null );
- final Properties attributes =
- buildAttributes( config.getChild( "attributes" ) );
- return new ExtensionDescriptor( urn, attributes );
- }
- else
- {
- String id = config.getAttribute( "urn", null ); // legacy
- if( id == null )
- {
- try
- {
- id = config.getAttribute( "id" );
- }
- catch( ConfigurationException e )
- {
- final String error =
- "Missing extensions identifier 'id' attribute."
- + ConfigurationUtil.list( config );
- throw new BuildException( error, e );
- }
- }
- final Properties attributes =
- buildAttributes( config.getChild( "attributes" ) );
- return new ExtensionDescriptor( id, attributes );
+ return attributes.getProperty( "urn:metro:lifestyle" );
}
}


Modified:
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/impl/ConfigurationBuilder.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/impl/ConfigurationBuilder.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/impl/ConfigurationBuilder.java
Sun Jun 12 09:47:29 2005
@@ -40,7 +40,7 @@
/**
* Utility class used to load Configuration trees from XML files.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ConfigurationBuilder
@@ -52,19 +52,7 @@
"net/dpml/meta/type.dtd" ),
new DTDInfo( "@SERVICE-DTD-PUBLIC-ID@",
"@SERVICE-DTD-SYSTEM-ID@",
- "net/dpml/meta/service.dtd" ),
- new DTDInfo( "-//AVALON/Component Type DTD Version 1.0//EN",
- "http://avalon.apache.org/dtds/meta/type_1_0.dtd";,
- "net/dpml/meta/type.dtd" ),
- new DTDInfo( "-//AVALON/Component Type DTD Version 1.1//EN",
- "http://avalon.apache.org/dtds/meta/type_1_1.dtd";,
- "net/dpml/meta/type.dtd" ),
- new DTDInfo( "-//AVALON/Service DTD Version 1.0//EN",
- "http://avalon.apache.org/dtds/meta/service_1_0.dtd";,
- "net/dpml/meta/service.dtd" ),
- new DTDInfo( "-//PHOENIX/Block Info DTD Version 1.0//EN",
-
"http://avalon.apache.org/dtds/phoenix/blockinfo_1.0.dtd";,
- "net/dpml/meta/blockinfo.dtd" ),
+ "net/dpml/meta/service.dtd" )
};

private static final DTDResolver DTD_RESOLVER =

Modified:
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/impl/DTDInfo.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/impl/DTDInfo.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/impl/DTDInfo.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
/**
* Holds information about a given DTD.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
class DTDInfo

Modified:
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/impl/DTDResolver.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/impl/DTDResolver.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/impl/DTDResolver.java
Sun Jun 12 09:47:29 2005
@@ -30,8 +30,7 @@
* A Class to help to resolve Entitys for items such as DTDs or
* Schemas.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
class DTDResolver

Modified:
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/verifier/impl/package.html
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/verifier/impl/package.html
(original)
+++
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/verifier/impl/package.html
Sun Jun 12 09:47:29 2005
@@ -7,7 +7,7 @@
<p>This package includes a set of classes supporting the verification of the
integrity of a component class and the verification of the integrity of a
relationships and inter-dependecies based on supplied meta info. The
-{@link org.apache.avalon.meta.info.verifier.TypeVerifier} provides
+{@link net.dpml.meta.info.verifier.TypeVerifier} provides
support for the validation of a component type implementation class. It
includes validation functions that check for structural and best-practice
integrity related to the class, lifecycle patterns and service.

Modified:
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/writer/impl/SerializedServiceWriter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/writer/impl/SerializedServiceWriter.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/writer/impl/SerializedServiceWriter.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
/**
* Write {@link Service} objects to a stream as serialized objects.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class SerializedServiceWriter

Modified:
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/writer/impl/SerializedTypeWriter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/writer/impl/SerializedTypeWriter.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/writer/impl/SerializedTypeWriter.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
/**
* Write {@link Type} objects to a stream as serialized objects.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class SerializedTypeWriter

Modified:
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLServiceWriter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLServiceWriter.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLServiceWriter.java
Sun Jun 12 09:47:29 2005
@@ -31,7 +31,7 @@
/**
* Write {@link Service} objects to a stream as xml documents.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class XMLServiceWriter

Modified:
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLTypeWriter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLTypeWriter.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLTypeWriter.java
Sun Jun 12 09:47:29 2005
@@ -31,26 +31,19 @@
import net.dpml.meta.info.InfoDescriptor;
import net.dpml.meta.info.CategoryDescriptor;
import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.StageDescriptor;
-import net.dpml.meta.info.ExtensionDescriptor;
import net.dpml.meta.info.Type;
-import net.dpml.meta.info.SecurityDescriptor;
-import net.dpml.meta.info.PermissionDescriptor;
import net.dpml.meta.info.writer.TypeWriter;

/**
* Write {@link Type} objects to a stream as xml documents.
*
* TODO: Address configuration schema support
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class XMLTypeWriter
implements TypeWriter
{
- private static final String AVALON_CONTEXT_CLASS =
- "org.apache.avalon.framework.context.Context";
-
private static final String METRO_CONTEXT_CLASS =
"net.dpml.context.Context";

@@ -61,21 +54,18 @@
* @param outputStream the stream to write to
* @throws Exception if unable to write xml
*/
- public void writeType( final Type type, final OutputStream outputStream )
+ public void writeType( Type type, OutputStream outputStream )
throws Exception
{
final Writer writer = new OutputStreamWriter( outputStream );
writeHeader( writer );
- writeDoctype( writer, "type", type.getInfo().isNative() );
+ writeDoctype( writer, "type" );
writer.write( "\n\n<type>" );
writeInfo( writer, type.getInfo() );
- writeSecurity( writer, type.getSecurity() );
writeLoggers( writer, type.getCategories() );
- writeContext( writer, type.getContext(), type.getInfo().isNative() );
+ writeContext( writer, type.getContext() );
writeServices( writer, type.getServices() );
writeDependencies( writer, type.getDependencies() );
- writeStages( writer, type.getStages() );
- writeExtensions( writer, type.getExtensions() );
writer.write( "\n</type>" );
writer.flush();
}
@@ -85,7 +75,7 @@
* @param writer the writer
* @throws IOException if unable to write xml
*/
- private void writeHeader( final Writer writer )
+ private void writeHeader( Writer writer )
throws IOException
{
writer.write( "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>" );
@@ -98,26 +88,14 @@
* @param root the root name of document
* @throws IOException if unable to write xml
*/
- private void writeDoctype( final Writer writer,
- final String root, boolean flag )
+ private void writeDoctype( Writer writer, String root )
throws IOException
{
- if( flag )
- {
- final String doctype =
- "\n<!DOCTYPE " + root
- + " PUBLIC \"@TYPE-DTD-PUBLIC-ID@\" "
- + "\"@TYPE-DTD-SYSTEM-ID@\" >";
- writer.write( doctype );
- }
- else
- {
- final String doctype =
- "\n<!DOCTYPE " + root
- + " PUBLIC \"-//AVALON/Type DTD Version 1.0//EN\" "
- + "\"http://avalon.apache.org/dtds/meta/type_1_1.dtd\"; >";
- writer.write( doctype );
- }
+ final String doctype =
+ "\n<!DOCTYPE " + root
+ + " PUBLIC \"@TYPE-DTD-PUBLIC-ID@\" "
+ + "\"@TYPE-DTD-SYSTEM-ID@\" >";
+ writer.write( doctype );
}

/**
@@ -127,10 +105,10 @@
* @param info the type info descriptor
* @throws IOException if unable to write xml
*/
- private void writeInfo( final Writer writer, final InfoDescriptor info )
+ private void writeInfo( Writer writer, InfoDescriptor info )
throws IOException
{
- writer.write( "\n <info native=\"" + info.isNative() + "\">" );
+ writer.write( "\n <info>" );

writer.write( "\n <name>");
writer.write( info.getName() );
@@ -167,74 +145,6 @@
}

/**
- * Write out xml representation of the security criteria.
- *
- * @param writer the writer
- * @param security the security descriptor
- * @throws IOException if unable to write xml
- */
- private void writeSecurity( final Writer writer,
- final SecurityDescriptor descriptor )
- throws IOException
- {
- PermissionDescriptor[] permissions = descriptor.getPermissions();
- if(
- ( 0 == descriptor.getAttributeNames().length )
- && ( 0 == permissions.length ) )
- {
- return;
- }
-
- writer.write( "\n <security>" );
- for( int i = 0; i < permissions.length; i++ )
- {
- writePermission( writer, permissions[ i ] );
- }
-
- writer.write( "\n </security>" );
- }
-
-
- /**
- * Write out xml representation of a logger.
- *
- * @param writer the writer
- * @param logger the logger
- * @throws IOException if unable to write xml
- */
- private void writePermission( final Writer writer,
- final PermissionDescriptor permission )
- throws IOException
- {
- writer.write( "\n <permission class=\"" );
- writer.write( permission.getClassname() );
- writer.write( "\" " );
- if( null != permission.getName() )
- {
- writer.write( "name=\"" );
- writer.write( permission.getName() );
- writer.write( "\"" );
- }
- if( 0 == permission.getActions().length )
- {
- writer.write( "/>" );
- }
- else
- {
- writer.write( ">" );
- String[] actions = permission.getActions();
- for( int i=0; i<actions.length; i++ )
- {
- String action = actions[i];
- writer.write( "\n <action>" );
- writer.write( action );
- writer.write( "</action>" );
- }
- writer.write( "\n </permission>" );
- }
- }
-
- /**
* Write out xml representation of a set of loggers.
*
* @param writer the writer
@@ -291,13 +201,13 @@
* @throws IOException if unable to write xml
*/
private void writeContext( final Writer writer,
- final ContextDescriptor context, boolean flag
)
+ final ContextDescriptor context )
throws IOException
{
final String type = context.getContextInterfaceClassname();
final EntryDescriptor[] entrys = context.getEntries();
final int count = context.getAttributeNames().length;
- if( getContextClassname( flag ).equals( type )
+ if( getContextClassname().equals( type )
&& 0 == count
&& 0 == entrys.length )
{
@@ -416,8 +326,7 @@
* @param dependencies the dependencies
* @throws IOException if unable to write xml
*/
- private void writeDependencies( final Writer writer,
- final DependencyDescriptor[]
dependencies )
+ private void writeDependencies( final Writer writer, final
DependencyDescriptor[] dependencies )
throws IOException
{
if( 0 == dependencies.length )
@@ -512,96 +421,8 @@
writer.write( "\"/>" );
}

- /**
- * Write out xml representation of a set of stages.
- *
- * @param writer the writer
- * @param stages the stages
- * @throws IOException if unable to write xml
- */
- private void writeStages( final Writer writer,
- final StageDescriptor[] stages )
- throws IOException
+ private String getContextClassname()
{
- if( 0 == stages.length )
- {
- return;
- }
-
- writer.write( "\n <stages>" );
- for( int i = 0; i < stages.length; i++ )
- {
- final StageDescriptor stage = stages[ i ];
- writer.write( "\n <stage " );
- writer.write( "id=\"" );
- writer.write( stage.getKey() );
-
- final int count = stage.getAttributeNames().length;
- if( 0 == count )
- {
- writer.write( "\"/>" );
- }
- else
- {
- writer.write( "\">" );
- writeAttributes( writer, stage );
- writer.write( "\n </stage>" );
- }
- }
- writer.write( "\n </stages>" );
+ return METRO_CONTEXT_CLASS;
}
-
- /**
- * Write out xml representation of a set of extensions.
- *
- * @param writer the writer
- * @param extensions the extensions
- * @throws IOException if unable to write xml
- */
- private void writeExtensions( final Writer writer,
- final ExtensionDescriptor[] extensions )
- throws IOException
- {
- if( 0 == extensions.length )
- {
- return;
- }
-
- writer.write( "\n <extensions>" );
- for( int i = 0; i < extensions.length; i++ )
- {
- final ExtensionDescriptor extension = extensions[ i ];
-
- writer.write( "\n <extension " );
- writer.write( "id=\"" );
- writer.write( extension.getKey() );
-
- final int count = extension.getAttributeNames().length;
- if( 0 == count )
- {
- writer.write( "\"/>" );
- }
- else
- {
- writer.write( "\">" );
- writeAttributes( writer, extension );
- writer.write( "\n </extension>" );
- }
- }
- writer.write( "\n </extensions>" );
- }
-
- private String getContextClassname( boolean flag )
- {
- if( flag )
- {
- return METRO_CONTEXT_CLASS;
- }
- else
- {
- return AVALON_CONTEXT_CLASS;
- }
- }
-
-
}

Modified:
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/builder/BuildException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/builder/BuildException.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/builder/BuildException.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
/**
* Exception to indicate error building meta object.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class BuildException

Modified:
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/builder/ServiceCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/builder/ServiceCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/builder/ServiceCreator.java
Sun Jun 12 09:47:29 2005
@@ -27,7 +27,7 @@
* Interface used to create a {@link Service}
* from a stream.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ServiceCreator

Modified:
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/builder/TypeCreator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/builder/TypeCreator.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/builder/TypeCreator.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
* that the Type could be built from non-XML
* sources and no XML classes need be in the classpath.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface TypeCreator

Modified:
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/builder/TypeFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/builder/TypeFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/builder/TypeFactory.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@
* that the Type could be built from non-XML
* sources and no XML classes need be in the classpath.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface TypeFactory extends TypeCreator

Modified:
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/locator/ResourceLocator.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/locator/ResourceLocator.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/locator/ResourceLocator.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@
* ResourceLocator provides an interface for the readers and writers to
* get input and output streams relative to a type.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ResourceLocator

Modified:
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/verifier/Verifier.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/verifier/Verifier.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/verifier/Verifier.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
* process may go so far as to ensure all the classes referenced actually
* exist, although this is not necessary.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Verifier

Modified:
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/verifier/VerifyException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/verifier/VerifyException.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/verifier/VerifyException.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@
/**
* Exception to indicate error verifying a component type.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class VerifyException

Modified:
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/writer/ServiceWriter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/writer/ServiceWriter.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/writer/ServiceWriter.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
* Interface implemented by objects supporting the writing
* of a {@link Service} to an output stream.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface ServiceWriter

Modified:
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/writer/TypeWriter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/writer/TypeWriter.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/spi/src/main/net/dpml/meta/info/writer/TypeWriter.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
* Interface implemented by objects supporting the writing
* of a {@link Type} to an output stream.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface TypeWriter

Modified:
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/ant/FormatEnum.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/ant/FormatEnum.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/ant/FormatEnum.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
* This is an enumeration that gives the option of either
* outputting as xml or as a serialized format.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class FormatEnum

Modified:
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/ant/MetaBuildListener.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/ant/MetaBuildListener.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/ant/MetaBuildListener.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@
/**
* An abstract build listener.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class MetaBuildListener implements BuildListener

Modified:
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/ant/MetaTask.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/ant/MetaTask.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/ant/MetaTask.java
Sun Jun 12 09:47:29 2005
@@ -46,7 +46,7 @@
/**
* Generate a meta info model from javadoc tags.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class MetaTask
@@ -156,20 +156,6 @@
return m_postfix;
}

- private boolean getNativeMode()
- {
- String namespace = getProject().getProperty( "dpml.meta.namespace" );
- if( "avalon".equals( namespace ) )
- {
- return false;
- }
- else
- {
- return true;
- }
- }
-
-
private String validatePostfix( String postfix )
{
if( postfix.equalsIgnoreCase( "xtype" )
@@ -296,7 +282,6 @@
*/
private Counter writeMetaData() throws IOException
{
- boolean flag = getNativeMode();
int services = 0;
int types = 0;
final int size = allClasses.size();
@@ -318,7 +303,7 @@
}
}

- Service service = new ServiceTag( javaClass, flag
).getService();
+ Service service = new ServiceTag( javaClass ).getService();
if( service == null )
{
continue;
@@ -358,7 +343,7 @@
}
}

- Type type = new TypeTag( javaClass, flag ).getType();
+ Type type = new TypeTag( javaClass ).getType();
if( type == null )
{
continue;

Modified:
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/ant/package.html
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/ant/package.html
(original)
+++
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/ant/package.html
Sun Jun 12 09:47:29 2005
@@ -2,7 +2,7 @@

<p>Metro component meta-info generation for Ant.</p>

- <p>The meta info generator task scans sources files for the presence of
an avalon.meta tags and based on the tag set specification, generates either
XML or serialized meta-info descriptors.</p>
+ <p>The meta info generator task scans sources files for the presence of
an metro.meta tags and based on the tag set specification, generates either
XML or serialized meta-info descriptors.</p>

<div class="h4">

@@ -27,7 +27,7 @@
<td>format</td>
<td>false</td>
<td>
-The output format may be one of <strong>xml</strong> or
<strong>serial</strong>. The xml format is less compact but more portable.
The serial format is appropriate when usage is know to be in the context of
the Avalon Meta API. The serial format is a serialized representation of the
corresponding Task or Service instance.
+The output format may be one of <strong>xml</strong> or
<strong>serial</strong>. The xml format is less compact but more portable.
The serial format is appropriate when usage is know to be in the context of
the Metro Meta API. The serial format is a serialized representation of the
corresponding Task or Service instance.
</td>
</tr>
<tr class="a">
@@ -36,13 +36,6 @@
<td>A boolean flag to force regenerating of the meta-files.
<strong>false</strong> (default) will generate the meta-file if the source is
newer than the exisiting meta-file or if the meta-file does not exist.
<strong>true</strong> will overwrite any existing meta-file irrespective of
the modification date.
</td>
</tr>
- <tr class="b">
- <td>postfix</td>
- <td>false</td>
- <td>
-Select between "xinfo" and "xtype" as the meta-info file type that is
generated. The xtype postfix is convinient when generating meta info
descriptors that must cooexist with the legacy Phoenix platform.
- </td>
- </tr>
</table>
</div>
<div class="h4">
@@ -72,7 +65,7 @@
<pre>
&lt;target name="meta" description="Generates the XML descriptors"
depends="build"&gt;
&lt;mkdir dir="${meta.dir}" /&gt;
- &lt;taskdef name="meta"
classname="org.apache.avalon.meta.tools.ant.MetaTask"&gt;
+ &lt;taskdef name="meta" classname="net.dpml.meta.tools.ant.MetaTask"&gt;
&lt;classpath refid="project.class.path" /&gt;
&lt;/taskdef&gt;
&lt;meta destDir="${meta.dir}" format="xml"&gt;
@@ -98,46 +91,49 @@

import java.io.File;

-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.ContextException;
+import net.dpml.logging.Logger;
+import net.dpml.logging.LogEnabled;
+import net.dpml.service.Serviceable;
+import net.dpml.service.ServiceManager;
+import net.dpml.service.ServiceException;
+import net.dpml.context.Context;
+import net.dpml.context.Contextualizable;
+import net.dpml.context.ContextException;

/**
* An example component containing meta info under javadoc tags.
*
- * @avalon.component name="secondary-component"
+ * @metro.component name="secondary-component"
* version="2.4" lifestyle="singleton"
- * @avalon.service type="SecondaryService" version="0.1"
+ * @metro.service type="SecondaryService" version="0.1"
*/
-public class Secondary extends AbstractLogEnabled
- implements Serviceable, SecondaryService, Contextualizable
+public class Secondary
+ implements Serviceable, SecondaryService, Contextualizable, LogEnabled
{
- private Logger m_system = null;
- private File m_home = null;
- private PrimaryService m_primary = null;
+ private Logger m_baseLogger;
+ private Logger m_systemLogger;
+ private File m_home;
+ private PrimaryService m_primary;

/**
* Supply of a logging channel to the component.
* @param logger the logging channel
- * @avalon.logger name="system"
+ * @metro.logger name="system"
*/
public void enableLogging( Logger logger )
{
super.enableLogging( logger );
- m_system = logger.getChildLogger( "system" );
+ m_baseLogger = logger;
+ m_systemLogger = logger.getChildLogger( "system" );
}

/**
* Supply of the runtime context by the container.
* @param context the runtime context
- * @avalon.entry key="home" type="java.io.File"
+ * @metro.entry key="home" type="java.io.File"
*/
- public void contextualize( Context context ) throws ContextException
+ public void contextualize( Context context )
+ throws ContextException
{
m_home = (File) context.get("home");
}
@@ -145,12 +141,13 @@
/**
* Supply of dependent services to this component by the container.
* @param manager the service manager
- * @avalon.dependency type="PrimaryService" version="1.3" key="primary"
+ * @metro.dependency type="PrimaryService" version="1.3" key="primary"
*/
- public void service( ServiceManager manager ) throws ServiceException
+ public void service( ServiceManager manager )
+ throws ServiceException
{
m_primary = (PrimaryService) manager.lookup( "primary" );
- m_system.info( "resolved primary service reference" );
+ m_systemLogger.info( "resolved primary service reference" );
}
}
</pre>
@@ -159,8 +156,6 @@
</div>

<div class="h4">
-
-
<h4>
<a name="Generated meta-info descriptor">Generated meta-info
descriptor</a>
</h4>
@@ -169,8 +164,9 @@
<div id="source">
<pre>
&lt;?xml version="1.0" ?&gt;
-&lt;!DOCTYPE type PUBLIC "-//AVALON/Type DTD Version 1.0//EN"
- "http://avalon.apache.org/dtds/meta/type_1_1.dtd"; &gt;
+&lt;!DOCTYPE type
+ PUBLIC "@TYPE-DTD-PUBLIC-ID@"
+ "@TYPE-DTD-SYSTEM-ID@" &gt;

&lt;type&gt;
&lt;info&gt;

Modified:
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/AbstractTag.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/AbstractTag.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/AbstractTag.java
Sun Jun 12 09:47:29 2005
@@ -32,7 +32,7 @@
/**
* A doclet tag representing the name of the Type.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class AbstractTag
@@ -49,16 +49,13 @@

private JavaClass m_class;

- private final boolean m_native;
-
/**
* Class constructor.
* @param clazz the javadoc class descriptor
*/
- public AbstractTag( final JavaClass clazz, boolean flag )
+ public AbstractTag( final JavaClass clazz )
{
m_class = clazz;
- m_native = flag;
}

/**
@@ -71,34 +68,22 @@
}

/**
- * Return the user defined namespace for avalon tags. The value returned
is
- * established by the javadoc tag 'avalon.namespace [namespace-value]'
where
+ * Return the user defined namespace for tags. The value returned is
+ * established by the javadoc tag 'metro.namespace [namespace-value]'
where
* [namespace-value] is a string representing the namespace identifier.
- * @return the namespace tag used to represent the avalon.meta tag space
+ * @return the namespace tag used to represent the metro.meta tag space
* @exception IllegalArgumentException if the namespace tag is declared
by does not
* contain a value
*/
public String getNS() throws IllegalArgumentException
{
- if( m_native )
- {
- return Tags.METRO;
- }
- else
- {
- return Tags.AVALON;
- }
- }
-
- public boolean isNative()
- {
- return m_native;
+ return Tags.METRO;
}

/**
- * Return the user defined namespace for avalon tags including the
+ * Return the user defined namespace for tags including the
* standard namespace delimiter. The value returned is established
- * by the javadoc tag 'avalon.namespace [namespace-value]' where
+ * by the javadoc tag 'metro.namespace [namespace-value]' where
* [namespace-value] is a string representing the namespace identifier
* with the namespace delimiter appended.
* @return the namespace tag with delimeter

Modified:
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/AttributeTag.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/AttributeTag.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/AttributeTag.java
Sun Jun 12 09:47:29 2005
@@ -27,7 +27,7 @@
/**
* A doclet tag representing the set of attributes associated with the class.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class AttributeTag extends AbstractTag
@@ -51,13 +51,13 @@
* Creation of a new attribute tag.
* @param clazz the javadoc class descriptor
*/
- public AttributeTag( final JavaClass clazz, boolean flag )
+ public AttributeTag( final JavaClass clazz )
{
- super( clazz, flag );
+ super( clazz );
}

/**
- * Return the value of all Avalon 'attribute' tags as a Properties value.
+ * Return the value of all 'attribute' tags as a Properties value.
* @return the attribute set as a property instance
*/
public Properties getProperties()

Modified:
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/ContextTag.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/ContextTag.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/ContextTag.java
Sun Jun 12 09:47:29 2005
@@ -31,26 +31,20 @@
import net.dpml.meta.info.EntryDescriptor;

/**
- * A doclet tag handler for the 'extension' tag.
+ * A doclet tag handler for the 'context' tag.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ContextTag extends AbstractTag
{
/**
- * The default native context class.
+ * The context class.
*/
- protected static final String NATIVE_CONTEXT_CLASS =
+ protected static final String CONTEXT_CLASS =
"net.dpml.context.Context";

/**
- * The avalon context class.
- */
- protected static final String AVALON_CONTEXT_CLASS =
- "org.apache.avalon.framework.context.Context";
-
- /**
* The javadoc key for the context tag.
*/
public static final String KEY = "context";
@@ -89,9 +83,9 @@
* Context tag constructor.
* @param clazz the javadoc class descriptor
*/
- public ContextTag( final JavaClass clazz, boolean flag )
+ public ContextTag( final JavaClass clazz )
{
- super( clazz, flag );
+ super( clazz );
}

/**

Modified:
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/DependencyTag.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/DependencyTag.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/DependencyTag.java
Sun Jun 12 09:47:29 2005
@@ -34,7 +34,7 @@
/**
* A doclet tag representing the lifestyle assigned to the Type.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DependencyTag extends AbstractTag
@@ -55,26 +55,20 @@
public static final String OPTIONAL_PARAM = "optional";

/**
- * The native service manager class.
+ * The service manager class.
*/
- protected static final String NATIVE_SERVICE_MANAGER =
+ protected static final String SERVICE_MANAGER =
"net.dpml.service.ServiceManager";

- /**
- * The avalon service manager class.
- */
- protected static final String AVALON_SERVICE_MANAGER =
- "org.apache.avalon.framework.service.ServiceManager";
-
private JavaMethod[] m_methods;

/**
* Class constructor.
* @param clazz the javadoc class descriptor
*/
- public DependencyTag( final JavaClass clazz, boolean flag )
+ public DependencyTag( final JavaClass clazz )
{
- super( clazz, flag );
+ super( clazz );
setMethods();
}

@@ -153,14 +147,7 @@

protected String getServiceManagerClassname()
{
- if( isNative() )
- {
- return NATIVE_SERVICE_MANAGER;
- }
- else
- {
- return AVALON_SERVICE_MANAGER;
- }
+ return SERVICE_MANAGER;
}
}


Modified:
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/LoggerTag.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/LoggerTag.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/LoggerTag.java
Sun Jun 12 09:47:29 2005
@@ -32,7 +32,7 @@
/**
* A doclet tag handler supporting 'logger' tags.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class LoggerTag extends AbstractTag
@@ -48,26 +48,20 @@
public static final String NAME_PARAM = "name";

/**
- * The avalon logger class.
+ * The logger class.
*/
- protected static final String NATIVE_LOGGER_CLASS =
+ protected static final String LOGGER_CLASS =
"net.dpml.logging.Logger";

- /**
- * The avalon logger class.
- */
- protected static final String AVALON_LOGGER_CLASS =
- "org.apache.avalon.framework.logger.Logger";
-
private JavaMethod[] m_methods;

/**
* The logger tag constructor.
* @param clazz the javadoc class descriptor.
*/
- public LoggerTag( final JavaClass clazz, boolean flag )
+ public LoggerTag( final JavaClass clazz )
{
- super( clazz, flag );
+ super( clazz );
setMethods();
}

@@ -114,13 +108,6 @@

protected String getLoggerClassname()
{
- if( isNative() )
- {
- return NATIVE_LOGGER_CLASS;
- }
- else
- {
- return AVALON_LOGGER_CLASS;
- }
+ return LOGGER_CLASS;
}
}

Modified:
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/SchemaTag.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/SchemaTag.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/SchemaTag.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
/**
* A doclet tag handler supporting 'logger' tags.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class SchemaTag extends AbstractTag
@@ -47,16 +47,16 @@
* The configuration schema tag constructor.
* @param clazz the javadoc class descriptor.
*/
- public SchemaTag( final JavaClass clazz, boolean flag )
+ public SchemaTag( final JavaClass clazz )
{
- super( clazz, flag );
+ super( clazz );
setMethods();
}

/**
* Return a schema descriptor string if present else return a null
* string. The value returned corresponds to information derived from
- * the first avalon.configuration tag declared.
+ * the first metro.configuration tag declared.
*
* @return the string identifying the configuration schema
*/

Modified:
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/ServiceTag.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/ServiceTag.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/ServiceTag.java
Sun Jun 12 09:47:29 2005
@@ -31,7 +31,7 @@
/**
* A doclet tag the declares a service definition.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ServiceTag extends AbstractTag
@@ -51,13 +51,13 @@
* Type tag constructor.
* @param clazz the javadoc class descriptor
*/
- public ServiceTag( final JavaClass clazz, boolean flag )
+ public ServiceTag( final JavaClass clazz )
{
- super( clazz, flag );
+ super( clazz );
}

/**
- * Return the value of the Avalon 'service' tag.
+ * Return the value of the 'service' tag.
* @return the service descriptor or null if no service is declared
*/
public Service getService()
@@ -69,7 +69,7 @@
}
final Version version = Version.getVersion( getNamedParameter( tag,
VERSION_PARAM, "" ) );
final String type = getJavaClass().getFullyQualifiedName();
- final Properties properties = new AttributeTag( getJavaClass(),
isNative() ).getProperties();
+ final Properties properties = new AttributeTag( getJavaClass()
).getProperties();
final ReferenceDescriptor ref = new ReferenceDescriptor( type,
version );
return new Service( ref, properties );
}

Modified:
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/ServicesTag.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/ServicesTag.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/ServicesTag.java
Sun Jun 12 09:47:29 2005
@@ -31,7 +31,7 @@
/**
* A doclet tag representing services exported by a type.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ServicesTag extends AbstractTag
@@ -45,9 +45,9 @@
* The service tag constructor.
* @param clazz the javadoc class descriptor
*/
- public ServicesTag( final JavaClass clazz, boolean flag )
+ public ServicesTag( final JavaClass clazz )
{
- super( clazz, flag );
+ super( clazz );
}

/**

Modified:
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/Tags.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/Tags.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/Tags.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
/**
* Interface holding static tag constants.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Tags
@@ -33,11 +33,6 @@
public static final String METRO = "metro";

/**
- * The defalt namespace for tags related to the meta package.
- */
- public static final String AVALON = "avalon";
-
- /**
* The delimiter between namespace and tag key.
*/
public static final String DELIMITER = ".";

Modified:
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/TypeTag.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/TypeTag.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/tools/src/main/net/dpml/meta/info/tags/TypeTag.java
Sun Jun 12 09:47:29 2005
@@ -24,12 +24,9 @@
import net.dpml.meta.info.Version;
import net.dpml.meta.info.ContextDescriptor;
import net.dpml.meta.info.DependencyDescriptor;
-import net.dpml.meta.info.ExtensionDescriptor;
import net.dpml.meta.info.InfoDescriptor;
import net.dpml.meta.info.CategoryDescriptor;
import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.StageDescriptor;
-import net.dpml.meta.info.SecurityDescriptor;
import net.dpml.meta.info.Type;

import com.thoughtworks.qdox.model.DocletTag;
@@ -37,7 +34,7 @@

/**
* <p>A doclet tag the declares a a {@link Type} descriptor using the
- * <code>&amp;avalon.type</code> or <code>&amp;metro.component</code>
+ * <code>&amp;metro.component</code>
* javadoc tag. The &amp;metro.component is senonomouse with
&amp;metro.type.
* The &amp;metro.type tag recognizes the following attributes:<p>
*
@@ -59,7 +56,7 @@
* is assumed.</td></tr>
* </table>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class TypeTag extends AbstractTag
@@ -93,13 +90,13 @@
* Type tag constructor.
* @param clazz the javadoc class descriptor
*/
- public TypeTag( final JavaClass clazz, boolean flag )
+ public TypeTag( final JavaClass clazz )
{
- super( clazz, flag );
+ super( clazz );
}

/**
- * Return the value of the Avalon 'component' tag.
+ * Return the value of the Metro 'component' tag.
* @return the name of the component type
* @exception IllegalArgumentException if the name tag does not contain a
value
*/
@@ -116,25 +113,19 @@
final String lifestyle = getLifestyle( tag );
final String collection = getLifestyleCollectionPolicy( tag );
final String type = getJavaClass().getFullyQualifiedName();
- final Properties properties = new AttributeTag( getJavaClass(),
isNative() ).getProperties();
- final String schema = new SchemaTag( getJavaClass(), isNative()
).getConfigurationSchema();
+ final Properties properties = new AttributeTag( getJavaClass()
).getProperties();
+ final String schema = new SchemaTag( getJavaClass()
).getConfigurationSchema();

final InfoDescriptor info =
new InfoDescriptor(
- name, type, version, lifestyle, collection, schema, isNative(),
properties );
- final SecurityDescriptor security =
- new SecurityTag( getJavaClass(), isNative()
).getSecurityDescriptor();
- final ServiceDescriptor[] services = new ServicesTag(
getJavaClass(), isNative() ).getServices();
- final CategoryDescriptor[] loggers = new LoggerTag( getJavaClass(),
isNative() ).getCategories();
+ name, type, version, lifestyle, collection, schema, properties );
+ final ServiceDescriptor[] services = new ServicesTag( getJavaClass()
).getServices();
+ final CategoryDescriptor[] loggers = new LoggerTag( getJavaClass()
).getCategories();
final DependencyDescriptor[] dependencies =
- new DependencyTag( getJavaClass(), isNative() ).getDependencies();
- final StageDescriptor[] stages = new StageTag( getJavaClass(),
isNative() ).getStages();
- final ExtensionDescriptor[] extensions = new ExtensionTag(
getJavaClass(), isNative() ).getExtensions();
- final ContextDescriptor context = new ContextTag( getJavaClass(),
isNative() ).getContext();
-
- return new Type(
- info, security, loggers, context, services, dependencies,
- stages, extensions, null );
+ new DependencyTag( getJavaClass() ).getDependencies();
+ final ContextDescriptor context = new ContextTag( getJavaClass()
).getContext();
+
+ return new Type( info, loggers, context, services, dependencies,
null );
}

private String getName(DocletTag tag)

Modified:
development/laboratory/users/niclas/osgi/meta/tools/src/test/net/dpml/meta/test/MetaTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/meta/tools/src/test/net/dpml/meta/test/MetaTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/meta/tools/src/test/net/dpml/meta/test/MetaTestCase.java
Sun Jun 12 09:47:29 2005
@@ -40,10 +40,10 @@
/**
* A testcase for the meta tools package. The testcase verifies the number
* and integrity of service and type defintions created as a result of a scan
- * of the working test directory for source files containing the
avalon.version
+ * of the working test directory for source files containing the
metro.version
* javadoc tag.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class MetaTestCase extends TestCase
{
@@ -91,7 +91,7 @@
/**
* Scan the test directory for source files and build up the
* qdox JavaSource defintions from which JavaClass defintions
- * are resolved. If the class contains a avalon.version tag
+ * are resolved. If the class contains a metro.version tag
* then we build a Type or Service instance (class or interface
* respectively, and add them to the type and service lists.
*
@@ -111,7 +111,7 @@
JavaClass c = classes[j];
if( c.isInterface() )
{
- Service service = new ServiceTag( c, true ).getService();
+ Service service = new ServiceTag( c ).getService();
if( service == null )
{
fail( "encounter null service: " + c );
@@ -131,7 +131,7 @@
}
else
{
- Type type = new TypeTag( c, true ).getType();
+ Type type = new TypeTag( c ).getType();
if( type == null )
{
fail( "encounter null type: " + c );

Modified: development/laboratory/users/niclas/osgi/module.xml
==============================================================================
--- development/laboratory/users/niclas/osgi/module.xml (original)
+++ development/laboratory/users/niclas/osgi/module.xml Sun Jun 12 09:47:29
2005
@@ -166,7 +166,6 @@
<package name="net.dpml.composition.event"/>
<package name="net.dpml.composition.info"/>
<package name="net.dpml.composition.model"/>
- <package name="net.dpml.extension"/>
<package name="net.dpml.logging.data"/>
<package name="net.dpml.meta.info"/>
</group>

Modified:
development/laboratory/users/niclas/osgi/parameters/api/src/main/net/dpml/parameters/ParameterException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/parameters/api/src/main/net/dpml/parameters/ParameterException.java
(original)
+++
development/laboratory/users/niclas/osgi/parameters/api/src/main/net/dpml/parameters/ParameterException.java
Sun Jun 12 09:47:29 2005
@@ -20,7 +20,7 @@
* Thrown when a <code>Parameterizable</code> component cannot be
parameterized
* properly, or if a value cannot be retrieved properly.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ParameterException

Modified:
development/laboratory/users/niclas/osgi/parameters/api/src/main/net/dpml/parameters/Parameterizable.java
==============================================================================
---
development/laboratory/users/niclas/osgi/parameters/api/src/main/net/dpml/parameters/Parameterizable.java
(original)
+++
development/laboratory/users/niclas/osgi/parameters/api/src/main/net/dpml/parameters/Parameterizable.java
Sun Jun 12 09:47:29 2005
@@ -31,7 +31,7 @@
* <code>Initializable.initialize()</code>.
* </p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Parameterizable

Modified:
development/laboratory/users/niclas/osgi/parameters/api/src/main/net/dpml/parameters/Parameters.java
==============================================================================
---
development/laboratory/users/niclas/osgi/parameters/api/src/main/net/dpml/parameters/Parameters.java
(original)
+++
development/laboratory/users/niclas/osgi/parameters/api/src/main/net/dpml/parameters/Parameters.java
Sun Jun 12 09:47:29 2005
@@ -44,7 +44,7 @@
* prevent potential data corruption.
* </p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Parameters

Modified:
development/laboratory/users/niclas/osgi/parameters/impl/src/main/net/dpml/parameters/impl/DefaultParameters.java
==============================================================================
---
development/laboratory/users/niclas/osgi/parameters/impl/src/main/net/dpml/parameters/impl/DefaultParameters.java
(original)
+++
development/laboratory/users/niclas/osgi/parameters/impl/src/main/net/dpml/parameters/impl/DefaultParameters.java
Sun Jun 12 09:47:29 2005
@@ -58,7 +58,7 @@
* prevent potential data corruption.
* </p>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultParameters implements Parameters, Serializable
@@ -697,7 +697,7 @@
* @throws ConfigurationException if an error occurs
*/
public static Parameters fromConfiguration( final Configuration
configuration )
- throws ConfigurationException
+ throws ParameterException
{
return fromConfiguration( configuration, "parameter" );
}
@@ -715,7 +715,7 @@
*/
public static Parameters fromConfiguration( final Configuration
configuration,
final String elementName )
- throws ConfigurationException, NullArgumentException
+ throws ParameterException, NullArgumentException
{
if( null == configuration )
{
@@ -734,7 +734,7 @@
}
catch( final Exception e )
{
- throw new ConfigurationException( "Cannot process
Configurable", configuration, e );
+ throw new ParameterException( "Cannot process
Configuration.", e );
}
}

@@ -775,7 +775,7 @@
}

/**
- * Creates a <code>java.util.Properties</code> object from an Avalon
+ * Creates a <code>java.util.Properties</code> object from a
* Parameters object.
*
* @param params a <code>Parameters</code> instance

Modified:
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/FatalServiceException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/FatalServiceException.java
(original)
+++
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/FatalServiceException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a fatal service error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class FatalServiceException

Modified:
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/ServiceException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/ServiceException.java
(original)
+++
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/ServiceException.java
Sun Jun 12 09:47:29 2005
@@ -20,7 +20,7 @@
/**
* The exception thrown to indicate a service related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class ServiceException extends Exception
{

Modified:
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/ServiceManager.java
==============================================================================
---
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/ServiceManager.java
(original)
+++
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/ServiceManager.java
Sun Jun 12 09:47:29 2005
@@ -42,7 +42,7 @@
* Therefore the <code>ServiceManager</code> can be implemented with a
* factory pattern, an object pool, or a simple Hashtable.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
* @see net.dpml.service.Serviceable
*/

Modified:
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/ServiceUnknownException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/ServiceUnknownException.java
(original)
+++
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/ServiceUnknownException.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* Exception to indicate that a service defintioon is unknown within
* the scope of a service manager.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class ServiceUnknownException

Modified:
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/Serviceable.java
==============================================================================
---
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/Serviceable.java
(original)
+++
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/Serviceable.java
Sun Jun 12 09:47:29 2005
@@ -20,7 +20,7 @@
* The serviceable interface provides support for the delivery of a service
* manager to a component during the lifecycle processing phase.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @see net.dpml.service.ServiceManager
*/
public interface Serviceable

Modified:
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/TransientServiceException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/TransientServiceException.java
(original)
+++
development/laboratory/users/niclas/osgi/service/api/src/main/net/dpml/service/TransientServiceException.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
* exception exposes a delay value which is the anticipated delay in
* service availability. A delay value of 0 indicates an unknown delay.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class TransientServiceException

Modified:
development/laboratory/users/niclas/osgi/system/api/src/main/net/dpml/system/CascadingIOException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/system/api/src/main/net/dpml/system/CascadingIOException.java
(original)
+++
development/laboratory/users/niclas/osgi/system/api/src/main/net/dpml/system/CascadingIOException.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
/**
* Exception to indicate that there was a IO exception.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: CascadingIOException.java 259 2004-10-30 07:24:40Z
mcconnell $
*/
public class CascadingIOException extends IOException

Modified:
development/laboratory/users/niclas/osgi/system/api/src/main/net/dpml/system/Factory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/system/api/src/main/net/dpml/system/Factory.java
(original)
+++
development/laboratory/users/niclas/osgi/system/api/src/main/net/dpml/system/Factory.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
/**
* A generic application factory.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: Factory.java 30977 2004-07-30 08:57:54Z niclas $
*/
public interface Factory

Modified:
development/laboratory/users/niclas/osgi/system/api/src/main/net/dpml/system/SystemException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/system/api/src/main/net/dpml/system/SystemException.java
(original)
+++
development/laboratory/users/niclas/osgi/system/api/src/main/net/dpml/system/SystemException.java
Sun Jun 12 09:47:29 2005
@@ -24,7 +24,7 @@
/**
* Exception to indicate that there was a system related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class SystemException extends CascadingIOException
{

Modified:
development/laboratory/users/niclas/osgi/system/api/src/main/net/dpml/system/SystemRuntimeException.java
==============================================================================
---
development/laboratory/users/niclas/osgi/system/api/src/main/net/dpml/system/SystemRuntimeException.java
(original)
+++
development/laboratory/users/niclas/osgi/system/api/src/main/net/dpml/system/SystemRuntimeException.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a system related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class SystemRuntimeException extends RuntimeException
{

Modified:
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/impl/DefaultSystemContext.java
==============================================================================
---
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/impl/DefaultSystemContext.java
(original)
+++
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/impl/DefaultSystemContext.java
Sun Jun 12 09:47:29 2005
@@ -40,7 +40,7 @@
* repository, working and temporary directories, and system level flags and
* services supporting the deployment of plugins.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultSystemContext extends DefaultContext implements
SystemContext

Modified:
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/impl/DefaultSystemContextFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/impl/DefaultSystemContextFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/impl/DefaultSystemContextFactory.java
Sun Jun 12 09:47:29 2005
@@ -83,7 +83,7 @@
* repository, working and temporary directories, and system level flags and
* services supporting the deployment of plugins.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultSystemContextFactory implements Factory,
SystemContextFactory

Modified:
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/impl/DefaultSystemCriteria.java
==============================================================================
---
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/impl/DefaultSystemCriteria.java
(original)
+++
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/impl/DefaultSystemCriteria.java
Sun Jun 12 09:47:29 2005
@@ -41,7 +41,7 @@
* DefaultLoggingCriteria is a class holding the values supplied by a user
* for application to a LoggingManager factory.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultSystemCriteria extends Criteria implements SystemCriteria

Modified:
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/monitors/CacheMonitorLoggerAdapter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/monitors/CacheMonitorLoggerAdapter.java
(original)
+++
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/monitors/CacheMonitorLoggerAdapter.java
Sun Jun 12 09:47:29 2005
@@ -34,7 +34,7 @@
* <p>
* The CacheMonitor must be thread safe.
* </p>
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: DownloadMonitor.java 183 2004-10-23 16:53:31Z niclas $
* @see Monitor
*/

Modified:
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/monitors/ConnectionMonitorLoggerAdapter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/monitors/ConnectionMonitorLoggerAdapter.java
(original)
+++
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/monitors/ConnectionMonitorLoggerAdapter.java
Sun Jun 12 09:47:29 2005
@@ -31,7 +31,7 @@
* <p>
* The NetworkMonitor must be thread safe.
* </p>
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: DownloadMonitor.java 183 2004-10-23 16:53:31Z niclas $
* @see Monitor
*/

Modified:
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/monitors/NetworkMonitorLoggerAdapter.java
==============================================================================
---
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/monitors/NetworkMonitorLoggerAdapter.java
(original)
+++
development/laboratory/users/niclas/osgi/system/impl/src/main/net/dpml/system/monitors/NetworkMonitorLoggerAdapter.java
Sun Jun 12 09:47:29 2005
@@ -32,7 +32,7 @@
* The DownloadMonitor must be thread safe, as many downloads may use
* the same DownloadMonitor for different work in-progress.
* </p>
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: DownloadMonitor.java 183 2004-10-23 16:53:31Z niclas $
* @see Monitor
*/

Modified:
development/laboratory/users/niclas/osgi/system/spi/src/main/net/dpml/system/Resources.properties
==============================================================================
---
development/laboratory/users/niclas/osgi/system/spi/src/main/net/dpml/system/Resources.properties
(original)
+++
development/laboratory/users/niclas/osgi/system/spi/src/main/net/dpml/system/Resources.properties
Sun Jun 12 09:47:29 2005
@@ -22,8 +22,6 @@

cli-info-description=Lists info about the controller context.

-cli-secure-description=Executes with code security enabled.
-
cli-language-description=A two-letter language code.

cli-dir-description=A relative or absolute path to a working directory. If
not supplied, the system will default to the current directory.

Modified:
development/laboratory/users/niclas/osgi/system/spi/src/main/net/dpml/system/SystemContext.java
==============================================================================
---
development/laboratory/users/niclas/osgi/system/spi/src/main/net/dpml/system/SystemContext.java
(original)
+++
development/laboratory/users/niclas/osgi/system/spi/src/main/net/dpml/system/SystemContext.java
Sun Jun 12 09:47:29 2005
@@ -31,7 +31,7 @@
/**
* The controller class manages the deployment of a set of plugins.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: SystemContext.java 364 2004-11-04 15:16:12Z mcconnell $
*/
public interface SystemContext extends Context

Modified:
development/laboratory/users/niclas/osgi/system/spi/src/main/net/dpml/system/SystemContextFactory.java
==============================================================================
---
development/laboratory/users/niclas/osgi/system/spi/src/main/net/dpml/system/SystemContextFactory.java
(original)
+++
development/laboratory/users/niclas/osgi/system/spi/src/main/net/dpml/system/SystemContextFactory.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
/**
* A factory supporting the creation of a system context.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: SystemContextFactory.java 364 2004-11-04 15:16:12Z
mcconnell $
*/
public interface SystemContextFactory extends Factory

Modified:
development/laboratory/users/niclas/osgi/system/spi/src/main/net/dpml/system/SystemCriteria.java
==============================================================================
---
development/laboratory/users/niclas/osgi/system/spi/src/main/net/dpml/system/SystemCriteria.java
(original)
+++
development/laboratory/users/niclas/osgi/system/spi/src/main/net/dpml/system/SystemCriteria.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
* a set of operations that enable easy manipulation of the system
* context parameters.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: SystemCriteria.java 364 2004-11-04 15:16:12Z mcconnell $
*/
public interface SystemCriteria extends Map

Modified:
development/laboratory/users/niclas/osgi/system/test/src/test/net/dpml/system/impl/test/SystemContextFactoryTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/system/test/src/test/net/dpml/system/impl/test/SystemContextFactoryTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/system/test/src/test/net/dpml/system/impl/test/SystemContextFactoryTestCase.java
Sun Jun 12 09:47:29 2005
@@ -33,7 +33,7 @@
/**
* SystemContextFactoryTestCase
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: SystemContextFactoryTestCase.java 363 2004-11-04 15:06:34Z
mcconnell $
*/
public class SystemContextFactoryTestCase extends TestCase

Modified:
development/laboratory/users/niclas/osgi/testing/cli/src/test/net/dpml/metro/test/MetroTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/cli/src/test/net/dpml/metro/test/MetroTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/cli/src/test/net/dpml/metro/test/MetroTestCase.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@
/**
* SystemContextFactoryTestCase
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class MetroTestCase extends TestCase

Modified:
development/laboratory/users/niclas/osgi/testing/components/src/main/net/dpml/test/components/AnotherTestComponent.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/components/src/main/net/dpml/test/components/AnotherTestComponent.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/components/src/main/net/dpml/test/components/AnotherTestComponent.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
* This is a component that can be tested relative a set of
* assigned permissions.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @metro.component name="anothertest" lifestyle="singleton"
* @metro.service
* type="net.dpml.test.components.AnotherTestService"

Modified:
development/laboratory/users/niclas/osgi/testing/components/src/main/net/dpml/test/components/AnotherTestService.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/components/src/main/net/dpml/test/components/AnotherTestService.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/components/src/main/net/dpml/test/components/AnotherTestService.java
Sun Jun 12 09:47:29 2005
@@ -21,7 +21,7 @@
* This is a component that can be tested relative a set of
* assigned permissions.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public interface AnotherTestService
{

Modified:
development/laboratory/users/niclas/osgi/testing/components/src/main/net/dpml/test/components/TestComponent.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/components/src/main/net/dpml/test/components/TestComponent.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/components/src/main/net/dpml/test/components/TestComponent.java
Sun Jun 12 09:47:29 2005
@@ -28,12 +28,9 @@
* This is a component that can be tested relative a set of
* assigned permissions.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @metro.component name="test" lifestyle="singleton"
* @metro.service type="net.dpml.test.components.TestService"
- * @metro.security.permission class="java.io.FilePermission"
- * name="urn:metro:dir"
- * actions="read,write"
*/
public class TestComponent extends AbstractLogEnabled
implements Contextualizable, TestService
@@ -77,8 +74,6 @@
}

/**
- * @metro.security.permission class="java.util.PropertyPermission"
- * name="java.version" actions="read"
*/
public String getJavaVersion()
{
@@ -86,8 +81,6 @@
}

/**
- * @metro.security.permission class="java.util.PropertyPermission"
- * name="java.version" actions="write"
*/
public void setJavaVersion( String newVer )
{

Modified:
development/laboratory/users/niclas/osgi/testing/components/src/main/net/dpml/test/components/TestService.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/components/src/main/net/dpml/test/components/TestService.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/components/src/main/net/dpml/test/components/TestService.java
Sun Jun 12 09:47:29 2005
@@ -22,7 +22,7 @@
* This is a component that can be tested relative a set of
* assigned permissions.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public interface TestService
{

Modified: development/laboratory/users/niclas/osgi/testing/includes/build.xml
==============================================================================
--- development/laboratory/users/niclas/osgi/testing/includes/build.xml
(original)
+++ development/laboratory/users/niclas/osgi/testing/includes/build.xml Sun
Jun 12 09:47:29 2005
@@ -5,13 +5,9 @@

<transit:import uri="artifact:template:dpml/magic/standard"/>

- <property name="dpml.meta.namespace" value="avalon"/>
+ <property name="dpml.meta.namespace" value="metro"/>

<target name="init" depends="standard.init">
- <x:filter key="avalon-framework-api" feature="uri"
- token="FRAMEWORK-API-SPEC"/>
- <x:filter key="avalon-framework-impl" feature="uri"
- token="FRAMEWORK-IMPL-SPEC"/>
<x:filter key="dpml-test-testa" feature="uri"
token="TEST-A-SPEC"/>
<x:filter key="dpml-test-testb" feature="uri"

Modified:
development/laboratory/users/niclas/osgi/testing/includes/src/main/BLOCK-INF/block.xml
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/includes/src/main/BLOCK-INF/block.xml
(original)
+++
development/laboratory/users/niclas/osgi/testing/includes/src/main/BLOCK-INF/block.xml
Sun Jun 12 09:47:29 2005
@@ -17,8 +17,6 @@
<artifact>@TEST-B-SPEC@</artifact>
<artifact>@TEST-C-SPEC@</artifact>
<artifact>@TEST-D-SPEC@</artifact>
- <artifact>@FRAMEWORK-API-SPEC@</artifact>
- <artifact>@FRAMEWORK-IMPL-SPEC@</artifact>
</classpath>
</classloader>

@@ -35,8 +33,8 @@
<container name="block">
<component name="test" class="net.dpml.test.teste.TestE">
<context>
- <entry key="home">
- <import key="urn:avalon:home"/>
+ <entry key="home" class="java.io.File" >
+ <import key="urn:metro:dir"/>
</entry>
</context>
</component>

Modified:
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/ComplexComponent.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/ComplexComponent.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/ComplexComponent.java
Sun Jun 12 09:47:29 2005
@@ -31,7 +31,7 @@
*
* @metro.component name="complex" lifestyle="singleton"
* @metro.service type="net.dpml.test.playground.ComplexService"
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class ComplexComponent
implements ComplexService, Startable, Disposable

Modified:
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/ComplexService.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/ComplexService.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/ComplexService.java
Sun Jun 12 09:47:29 2005
@@ -20,7 +20,7 @@
/**
* The <code>ComplexService</code> does do anything.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public interface ComplexService
{

Modified:
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/NullService.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/NullService.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/NullService.java
Sun Jun 12 09:47:29 2005
@@ -20,7 +20,7 @@
/**
* The <code>NullService</code> does nothing.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public interface NullService
{

Modified:
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/SimpleComponent.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/SimpleComponent.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/SimpleComponent.java
Sun Jun 12 09:47:29 2005
@@ -34,14 +34,11 @@
* BasicService and provides SimpleService.
*
* @metro.component name="simple" lifestyle="singleton"
- * @metro.stage id="urn:dpml.test.playground:exploitable"
- * @metro.stage id="urn:dpml.test.playground:demonstratable"
* @metro.service type="net.dpml.test.playground.SimpleService"
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class SimpleComponent extends AbstractLogEnabled
- implements Configurable, Serviceable, Initializable, Startable,
SimpleService,
- Exploitable, Demonstratable, Disposable
+ implements Configurable, Serviceable, Initializable, Startable,
SimpleService, Disposable
{

private String m_message;
@@ -74,7 +71,8 @@
* version="1.1" key="basic"
* @exception ServiceException if a service error occurs
*/
- public void service( ServiceManager manager ) throws ServiceException
+ public void service( ServiceManager manager )
+ throws ServiceException
{
getLogger().info( "service" );
m_basic = (BasicService) manager.lookup( "basic" );
@@ -82,40 +80,6 @@
}

//=======================================================================
- // Exploitable
- //=======================================================================
-
- /**
- * The create stage interface implementation for the Exloitable
extension.
- */
- public void incarnate()
- {
- getLogger().info( "incarnation stage" );
- }
-
- /**
- * The destroy stage interface implementation for the Exloitable
extension.
- */
- public void etherialize()
- {
- getLogger().info( "etherialize stage" );
- }
-
-
- //=======================================================================
- // Demonstratable
- //=======================================================================
-
- /**
- * Prints out the supplied message.
- * @param message the message to print
- */
- public void demo( String message )
- {
- getLogger().info( "handling demonstratable stage: " + message );
- }
-
- //=======================================================================
// Initializable
//=======================================================================


Modified:
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/SimpleComponent.xconfig
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/SimpleComponent.xconfig
(original)
+++
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/SimpleComponent.xconfig
Sun Jun 12 09:47:29 2005
@@ -6,7 +6,7 @@
version 1.1, a copy of which has been included with this distribution in
the LICENSE.txt file.

-@author Avalon Development Team
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
@version $Id$
-->


Modified:
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/SimpleService.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/SimpleService.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/SimpleService.java
Sun Jun 12 09:47:29 2005
@@ -20,7 +20,7 @@
/**
* The <code>SimpleService</code> executes an objective.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/

public interface SimpleService

Modified:
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/TerminalComponent.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/TerminalComponent.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/TerminalComponent.java
Sun Jun 12 09:47:29 2005
@@ -28,7 +28,7 @@
*
* @metro.component name="terminal"
* @metro.service type="net.dpml.test.playground.basic.BasicService"
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class TerminalComponent extends AbstractLogEnabled
implements BasicService, Disposable

Modified:
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicComponent.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicComponent.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicComponent.java
Sun Jun 12 09:47:29 2005
@@ -36,7 +36,7 @@
*
* @metro.component name="basic" lifestyle="singleton"
* @metro.service type="net.dpml.test.playground.basic.BasicService"
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class BasicComponent extends AbstractLogEnabled
implements Contextualizable, Configurable, Initializable,

Modified:
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicComponent.xconfig
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicComponent.xconfig
(original)
+++
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicComponent.xconfig
Sun Jun 12 09:47:29 2005
@@ -6,7 +6,7 @@
version 1.1, a copy of which has been included with this distribution in
the LICENSE.txt file.

-@author Avalon Development Team
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
@version $Id$
-->


Modified:
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicComponent.xprofile
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicComponent.xprofile
(original)
+++
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicComponent.xprofile
Sun Jun 12 09:47:29 2005
@@ -6,7 +6,7 @@
version 1.1, a copy of which has been included with this distribution in
the LICENSE.txt file.

-@author Avalon Development Team
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
@version $Id$
-->

@@ -21,10 +21,10 @@

<profile name="basic">
<context class="net.dpml.test.playground.basic.BasicContextImp">
- <entry key="home">
+ <entry key="home" class="java.io.File" >
<import key="urn:metro:dir"/>
</entry>
- <entry key="location">
+ <entry key="location" class="java.lang.String" >
<constructor>Paris</constructor>
</entry>
</context>

Modified:
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicContext.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicContext.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicContext.java
Sun Jun 12 09:47:29 2005
@@ -25,7 +25,7 @@
* Simple non-standard Context interface to demonstration context
* management at the level of different context types.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public interface BasicContext extends Context
{

Modified:
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicContextImp.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicContextImp.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicContextImp.java
Sun Jun 12 09:47:29 2005
@@ -27,7 +27,7 @@
* of a context management fraework to show how a context class can be
* supplied to a component declaring a context interface criteria.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class BasicContextImp extends DefaultContext implements BasicContext
{

Modified:
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicService.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicService.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/playground/src/main/net/dpml/test/playground/basic/BasicService.java
Sun Jun 12 09:47:29 2005
@@ -21,10 +21,10 @@
* The <code>BasicService</code> executes a prime objective.
*
* @metro.service
- * @metro.attribute key="urn:avalon:service.name" value="basic"
- * @metro.attribute key="urn:avalon:service.description"
- * value="A demonstration service used within the scope of the Avalon
playground package for educational and unit testing purpose"
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @metro.attribute key="urn:metro:service.name" value="basic"
+ * @metro.attribute key="urn:metro:service.description"
+ * value="A demonstration service used within the scope of the Metro
playground package for educational and unit testing purpose"
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public interface BasicService
{

Modified:
development/laboratory/users/niclas/osgi/testing/testa/src/main/net/dpml/test/testa/TestA.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/testa/src/main/net/dpml/test/testa/TestA.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/testa/src/main/net/dpml/test/testa/TestA.java
Sun Jun 12 09:47:29 2005
@@ -32,22 +32,22 @@
{
/**
* @metro.context type="net.dpml.test.testa.Facade"
- * @metro.entry key="urn:avalon:partition"
- * @metro.entry key="urn:avalon:classloader" type="java.lang.ClassLoader"
- * @metro.entry key="urn:avalon:home" type="java.io.File"
- * @metro.entry key="urn:avalon:temp" type="java.io.File"
- * @metro.entry key="urn:avalon:name" alias="name"
+ * @metro.entry key="urn:metro:partition"
+ * @metro.entry key="urn:metro:classloader" type="java.lang.ClassLoader"
+ * @metro.entry key="urn:metro:dir" type="java.io.File"
+ * @metro.entry key="urn:metro:temp" type="java.io.File"
+ * @metro.entry key="urn:metro:name" alias="name"
* @metro.entry key="home" type="java.io.File"
* @metro.entry key="time" type="java.util.Date" volatile="true"
* @metro.entry key="path"
*/
public void contextualize( Context context ) throws ContextException
{
- getLogger().info( "name: " + context.get( "urn:avalon:name" ) );
- getLogger().info( "partition: " + context.get(
"urn:avalon:partition" ) );
- getLogger().info( "classloader: " + context.get(
"urn:avalon:classloader" ) );
- getLogger().info( "work: " + context.get( "urn:avalon:home" ) );
- getLogger().info( "temp: " + context.get( "urn:avalon:temp" ) );
+ getLogger().info( "name: " + context.get( "urn:metro:name" ) );
+ getLogger().info( "partition: " + context.get( "urn:metro:partition"
) );
+ getLogger().info( "classloader: " + context.get(
"urn:metro:classloader" ) );
+ getLogger().info( "work: " + context.get( "urn:metro:dir" ) );
+ getLogger().info( "temp: " + context.get( "urn:metro:temp" ) );
}

public void initialize() throws Exception

Modified:
development/laboratory/users/niclas/osgi/testing/testc/src/main/net/dpml/test/testc/TestC.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/testc/src/main/net/dpml/test/testc/TestC.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/testc/src/main/net/dpml/test/testc/TestC.java
Sun Jun 12 09:47:29 2005
@@ -43,7 +43,7 @@
*/
public void service( ServiceManager manager ) throws ServiceException
{
- getLogger().info( "service stage" );
+ getLogger().info( "service" );
Logger logger = getLogger().getChildLogger( "service" );
logger.info( "lookup A" );
manager.lookup( "a" );

Modified:
development/laboratory/users/niclas/osgi/testing/testcyclic/src/main/net/dpml/test/testcyclic/TestCyclicA.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/testcyclic/src/main/net/dpml/test/testcyclic/TestCyclicA.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/testcyclic/src/main/net/dpml/test/testcyclic/TestCyclicA.java
Sun Jun 12 09:47:29 2005
@@ -34,7 +34,7 @@
*/
public void service( ServiceManager manager ) throws ServiceException
{
- getLogger().info( "service stage" );
+ getLogger().info( "service" );
Logger logger = getLogger().getChildLogger( "service" );
logger.info( "lookup B" );
manager.lookup( "CyclicB" );

Modified:
development/laboratory/users/niclas/osgi/testing/testcyclic/src/main/net/dpml/test/testcyclic/TestCyclicB.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/testcyclic/src/main/net/dpml/test/testcyclic/TestCyclicB.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/testcyclic/src/main/net/dpml/test/testcyclic/TestCyclicB.java
Sun Jun 12 09:47:29 2005
@@ -34,7 +34,7 @@
*/
public void service( ServiceManager manager ) throws ServiceException
{
- getLogger().info( "service stage" );
+ getLogger().info( "service" );
Logger logger = getLogger().getChildLogger( "service" );
logger.info( "lookup A" );
manager.lookup( "CyclicA" );

Modified:
development/laboratory/users/niclas/osgi/testing/testd/src/main/net/dpml/test/testd/TestD.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/testd/src/main/net/dpml/test/testd/TestD.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/testd/src/main/net/dpml/test/testd/TestD.java
Sun Jun 12 09:47:29 2005
@@ -41,7 +41,7 @@
*/
public void service( ServiceManager manager ) throws ServiceException
{
- getLogger().info( "service stage" );
+ getLogger().info( "service" );
Logger logger = getLogger().getChildLogger( "service" );
logger.info( "lookup A" );
manager.lookup( "a" );

Modified:
development/laboratory/users/niclas/osgi/testing/teste/src/main/net/dpml/test/teste/TestE.java
==============================================================================
---
development/laboratory/users/niclas/osgi/testing/teste/src/main/net/dpml/test/teste/TestE.java
(original)
+++
development/laboratory/users/niclas/osgi/testing/teste/src/main/net/dpml/test/teste/TestE.java
Sun Jun 12 09:47:29 2005
@@ -40,7 +40,7 @@
*/
public void service( ServiceManager manager ) throws ServiceException
{
- getLogger().info( "service stage" );
+ getLogger().info( "service" );
Logger logger = getLogger().getChildLogger( "service" );
logger.info( "lookup A" );
manager.lookup( "a" );

Modified:
development/laboratory/users/niclas/osgi/unit/src/main/net/dpml/metro/unit/CompositionTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/unit/src/main/net/dpml/metro/unit/CompositionTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/unit/src/main/net/dpml/metro/unit/CompositionTestCase.java
Sun Jun 12 09:47:29 2005
@@ -37,7 +37,7 @@

/**
* AbstractCompositionTestCase
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: CompositionTestCase.java 363 2004-11-04 15:06:34Z mcconnell
$
*/
public abstract class CompositionTestCase extends TestCase

Copied:
development/laboratory/users/niclas/osgi/unit/src/main/net/dpml/metro/unit/TestContext.java
(from r2825,
qa/main/2450fork-rc/metro/classic/unit/src/main/net/dpml/metro/unit/TestContext.java)
==============================================================================
---
qa/main/2450fork-rc/metro/classic/unit/src/main/net/dpml/metro/unit/TestContext.java
(original)
+++
development/laboratory/users/niclas/osgi/unit/src/main/net/dpml/metro/unit/TestContext.java
Sun Jun 12 09:47:29 2005
@@ -32,7 +32,7 @@
* constructors.
* </p>
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
- * @version $Id: LoggerParameter.java 259 2004-10-30 07:24:40Z mcconnell $
+ * @version $Id$
*/
public class TestContext extends DefaultContext
{

Copied:
development/laboratory/users/niclas/osgi/unit/src/main/net/dpml/metro/unit/TestLogger.java
(from r2825,
qa/main/2450fork-rc/metro/classic/unit/src/main/net/dpml/metro/unit/TestLogger.java)
==============================================================================
---
qa/main/2450fork-rc/metro/classic/unit/src/main/net/dpml/metro/unit/TestLogger.java
(original)
+++
development/laboratory/users/niclas/osgi/unit/src/main/net/dpml/metro/unit/TestLogger.java
Sun Jun 12 09:47:29 2005
@@ -29,7 +29,7 @@
* does not have a logger to supply.
*
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
- * @version $Id: ConsoleLogger.java 259 2004-10-30 07:24:40Z mcconnell $
+ * @version $Id$
*/
public class TestLogger
implements Logger

Copied:
development/laboratory/users/niclas/osgi/unit/src/main/net/dpml/metro/unit/TestServiceManager.java
(from r2825,
qa/main/2450fork-rc/metro/classic/unit/src/main/net/dpml/metro/unit/TestServiceManager.java)
==============================================================================
---
qa/main/2450fork-rc/metro/classic/unit/src/main/net/dpml/metro/unit/TestServiceManager.java
(original)
+++
development/laboratory/users/niclas/osgi/unit/src/main/net/dpml/metro/unit/TestServiceManager.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,7 @@
* The ServiceManager is populated through a Map in the constructor.
* </p>
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
- * @version $Id: LoggerParameter.java 259 2004-10-30 07:24:40Z mcconnell $
+ * @version $Id$
*/
public class TestServiceManager
implements ServiceManager

Modified:
development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/Defaults.java
==============================================================================
---
development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/Defaults.java
(original)
+++
development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/Defaults.java
Sun Jun 12 09:47:29 2005
@@ -30,7 +30,7 @@
* Gets a set of default property values based on a sequence of default value
* search components or finders.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class Defaults extends Properties

Modified:
development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/DefaultsBuilder.java
==============================================================================
---
development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/DefaultsBuilder.java
(original)
+++
development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/DefaultsBuilder.java
Sun Jun 12 09:47:29 2005
@@ -32,7 +32,7 @@
* A utility class that provides support for the establishment
* of a set of installation properties.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultsBuilder

Modified:
development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/DefaultsFinder.java
==============================================================================
---
development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/DefaultsFinder.java
(original)
+++
development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/DefaultsFinder.java
Sun Jun 12 09:47:29 2005
@@ -23,7 +23,7 @@
/**
* Finds a set of default property values.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface DefaultsFinder

Modified:
development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/SimpleDefaultsFinder.java
==============================================================================
---
development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/SimpleDefaultsFinder.java
(original)
+++
development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/SimpleDefaultsFinder.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
/**
* Attempts to discover defaults using an array of Properties as value
sources.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class SimpleDefaultsFinder implements DefaultsFinder

Modified:
development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/SystemDefaultsFinder.java
==============================================================================
---
development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/SystemDefaultsFinder.java
(original)
+++
development/laboratory/users/niclas/osgi/util/defaults/src/main/net/dpml/defaults/SystemDefaultsFinder.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
/**
* Finds default property values within the system properties.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class SystemDefaultsFinder extends SimpleDefaultsFinder

Modified:
development/laboratory/users/niclas/osgi/util/defaults/src/test/net/dpml/defaults/test/DefaultsBuilderTestCase.java
==============================================================================
---
development/laboratory/users/niclas/osgi/util/defaults/src/test/net/dpml/defaults/test/DefaultsBuilderTestCase.java
(original)
+++
development/laboratory/users/niclas/osgi/util/defaults/src/test/net/dpml/defaults/test/DefaultsBuilderTestCase.java
Sun Jun 12 09:47:29 2005
@@ -26,7 +26,7 @@
/**
* DefaultsBuilderTestCase
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class DefaultsBuilderTestCase extends TestCase

---

• svn commit: r2828 - in development/laboratory/users/niclas/osgi: . activation/api/src/main/net/dpml/activation activation/impl activation/impl/etc/test activation/impl/etc/test/system activation/impl/src/main/net/dpml/activation/impl activation/providers/avalon activation/providers/metro/src/main/net/dpml/activation/metro activation/test activation/test/etc/test activation/test/src/test/net/dpml/activation/impl/test activity/api/src/main/net/dpml/activity composition/api/src/main/net/dpml/composition/data composition/api/src/main/net/dpml/composition/event composition/api/src/main/net/dpml/composition/info composition/api/src/main/net/dpml/composition/model composition/api/src/test/net/dpml/composition/data/test composition/impl/src/main/net/dpml/composition/data/builder composition/impl/src/main/net/dpml/composition/data/writer composition/impl/src/main/net/dpml/composition/model/impl composition/impl/src/main/net/dpml/composition/util composition/impl/src/test/net/dpml/composition/model/builder composition/impl/src/test/net/dpml/composition/model/impl composition/spi/src/main/net/dpml/composition/data/builder composition/spi/src/main/net/dpml/composition/data/writer composition/spi/src/main/net/dpml/composition/provider composition/spi/src/main/net/dpml/composition/util composition/test composition/test/etc/test composition/test/src/main/net/dpml/composition/test composition/test/src/test/net/dpml/composition/model/impl/test configuration/api/src/main/net/dpml/configuration configuration/impl/src/main/net/dpml/configuration/impl configuration/impl/src/test/net/dpml/configuration/test context/api/src/main/net/dpml/context context/impl/src/main/net/dpml/context/impl extension logging/api/src/main/net/dpml/logging logging/criteria/src/main/net/dpml/logging/criteria logging/data/src/main/net/dpml/logging/data logging/data/src/test/net/dpml/logging/data/test logging/providers/log4j/impl logging/providers/log4j/impl/src/main/net/dpml/logging/log4j logging/providers/log4j/test/etc/test logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test logging/providers/logkit/api/src/main/net/dpml/logging/logkit logging/providers/logkit/impl logging/providers/logkit/impl/src/main/net/dpml/logging/logkit logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/factory/io/rotate logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/format logging/providers/logkit/impl/src/main/net/dpml/logging/logkit/util logging/providers/logkit/plugins/datagram/src/main/net/dpml/logging/logkit/datagram logging/providers/logkit/plugins/socket/src/main/net/dpml/logging/logkit/socket logging/providers/logkit/plugins/syslog/src/main/net/dpml/logging/logkit/syslog logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test logging/spi/src/main/net/dpml/logging/provider main/src/main/net/dpml/metro meta/api meta/api/src/main/net/dpml/meta meta/api/src/main/net/dpml/meta/info meta/api/src/test/net/dpml/meta/info/test meta/impl/src/main/net/dpml/meta/info/builder/impl meta/impl/src/main/net/dpml/meta/info/impl meta/impl/src/main/net/dpml/meta/info/verifier/impl meta/impl/src/main/net/dpml/meta/info/writer/impl meta/impl/src/test/net/dpml/meta/compat meta/impl/src/test/net/dpml/meta/legacy meta/spi/src/main/net/dpml/meta/info/builder meta/spi/src/main/net/dpml/meta/info/locator meta/spi/src/main/net/dpml/meta/info/verifier meta/spi/src/main/net/dpml/meta/info/writer meta/tools/src/main/net/dpml/meta/info/ant meta/tools/src/main/net/dpml/meta/info/tags meta/tools/src/test/net/dpml/meta/test parameters/api/src/main/net/dpml/parameters parameters/impl/src/main/net/dpml/parameters/impl service/api/src/main/net/dpml/service system/api/src/main/net/dpml/system system/impl/src/main/net/dpml/system/impl system/impl/src/main/net/dpml/system/monitors system/spi/src/main/net/dpml/system system/test/src/test/net/dpml/system/impl/test testing/cli/src/test/net/dpml/metro/test testing/components/src/main/net/dpml/test/components testing/includes testing/includes/src/main/BLOCK-INF testing/playground/src/main/net/dpml/test/playground testing/playground/src/main/net/dpml/test/playground/basic testing/testa/src/main/net/dpml/test/testa testing/testc/src/main/net/dpml/test/testc testing/testcyclic/src/main/net/dpml/test/testcyclic testing/testd/src/main/net/dpml/test/testd testing/teste/src/main/net/dpml/test/teste unit/src/main/net/dpml/metro/unit util/defaults/src/main/net/dpml/defaults util/defaults/src/test/net/dpml/defaults/test, niclas, 06/12/2005

---

Archive powered by MHonArc 2.6.24.