You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by tj...@apache.org on 2015/06/09 17:33:26 UTC
svn commit: r1684451 [1/4] - in /aries/branches/subsystemsR6: ./
application/application-itests/
application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/
async/ blueprint/blueprint-authz/ blueprint/blueprint-authz/src/m...
Author: tjwatson
Date: Tue Jun 9 15:33:24 2015
New Revision: 1684451
URL: http://svn.apache.org/r1684451
Log:
Merged latest trunk into subsystemsR6
Added:
aries/branches/subsystemsR6/application/application-itests/test.eba
- copied unchanged from r1684406, aries/trunk/application/application-itests/test.eba
aries/branches/subsystemsR6/application/application-itests/test2-resolved.eba
- copied unchanged from r1684406, aries/trunk/application/application-itests/test2-resolved.eba
aries/branches/subsystemsR6/application/application-itests/test2.eba
- copied unchanged from r1684406, aries/trunk/application/application-itests/test2.eba
aries/branches/subsystemsR6/async/
- copied from r1684406, aries/trunk/async/
aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.5.xsd
- copied unchanged from r1684406, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.5.xsd
aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/resources/CmPropertiesTest.xml
- copied unchanged from r1684406, aries/trunk/blueprint/blueprint-itests/src/test/resources/CmPropertiesTest.xml
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java
- copied unchanged from r1684406, aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/OsgiServiceRef.java
- copied unchanged from r1684406, aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/OsgiServiceRef.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ProducedBean.java
- copied unchanged from r1684406, aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ProducedBean.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/Namespaces.java
- copied unchanged from r1684406, aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/Namespaces.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean4.java
- copied unchanged from r1684406, aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean4.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java
- copied unchanged from r1684406, aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java
- copied unchanged from r1684406, aries/trunk/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java
aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/Namespaces.java
- copied unchanged from r1684406, aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/Namespaces.java
aries/branches/subsystemsR6/esa-ant-task/
- copied from r1684406, aries/trunk/esa-ant-task/
aries/branches/subsystemsR6/jpa/examples/
- copied from r1684406, aries/trunk/jpa/examples/
aries/branches/subsystemsR6/jpa/itests/
- copied from r1684406, aries/trunk/jpa/itests/
aries/branches/subsystemsR6/jpa/jpa-api/src/main/java/org/apache/aries/jpa/supplier/
- copied from r1684406, aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/supplier/
aries/branches/subsystemsR6/jpa/jpa-api/src/main/java/org/apache/aries/jpa/template/
- copied from r1684406, aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/template/
aries/branches/subsystemsR6/jpa/jpa-blueprint/
- copied from r1684406, aries/trunk/jpa/jpa-blueprint/
aries/branches/subsystemsR6/jpa/jpa-container-eclipselink-adapter/LICENSE
- copied unchanged from r1684406, aries/trunk/jpa/jpa-container-eclipselink-adapter/LICENSE
aries/branches/subsystemsR6/jpa/jpa-container-eclipselink-adapter/NOTICE
- copied unchanged from r1684406, aries/trunk/jpa/jpa-container-eclipselink-adapter/NOTICE
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java
- copied unchanged from r1684406, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/AriesEntityManagerFactoryBuilder.java
- copied unchanged from r1684406, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/AriesEntityManagerFactoryBuilder.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/DSFTracker.java
- copied unchanged from r1684406, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/DSFTracker.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/DataSourceTracker.java
- copied unchanged from r1684406, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/DataSourceTracker.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedEMF.java
- copied unchanged from r1684406, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedEMF.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
- copied unchanged from r1684406, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java
- copied unchanged from r1684406, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/StoredPerProvider.java
- copied unchanged from r1684406, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/StoredPerProvider.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/
- copied from r1684406, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/DummyDataSource.java
- copied unchanged from r1684406, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/DummyDataSource.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/TransformerRegistrySingleton.java
- copied unchanged from r1684406, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/TransformerRegistrySingleton.java
aries/branches/subsystemsR6/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/impl/
- copied from r1684406, aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/impl/
aries/branches/subsystemsR6/jpa/jpa-parent/
- copied from r1684406, aries/trunk/jpa/jpa-parent/
aries/branches/subsystemsR6/jpa/jpa-support/
- copied from r1684406, aries/trunk/jpa/jpa-support/
aries/branches/subsystemsR6/subsystem/subsystem-gogo-command/
- copied from r1684406, aries/trunk/subsystem/subsystem-gogo-command/
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java
- copied unchanged from r1684406, aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java
aries/branches/subsystemsR6/versioning/versioning-checker/src/test/java/org/apache/aries/versioning/tests/FilterResultsTest.java
- copied unchanged from r1684406, aries/trunk/versioning/versioning-checker/src/test/java/org/apache/aries/versioning/tests/FilterResultsTest.java
aries/branches/subsystemsR6/versioning/versioning-checker/src/test/resources/
- copied from r1684406, aries/trunk/versioning/versioning-checker/src/test/resources/
Removed:
aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/service/CmPropertiesTest.xml
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/OsgiServiceBean.java
aries/branches/subsystemsR6/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/
aries/branches/subsystemsR6/jpa/jpa-blueprint-aries/
aries/branches/subsystemsR6/jpa/jpa-blueprint-testbundle/
aries/branches/subsystemsR6/jpa/jpa-container-advancedtestbundle/
aries/branches/subsystemsR6/jpa/jpa-container-context/
aries/branches/subsystemsR6/jpa/jpa-container-itest/
aries/branches/subsystemsR6/jpa/jpa-container-testbundle/
aries/branches/subsystemsR6/jpa/jpa-container-testbundle-eclipselink/
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/annotation/
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/EntityManagerFactoryManager.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/InvalidPersistenceUnitException.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/InvalidRangeCombination.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/NLS.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleHelper.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceDescriptorImpl.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parsing/
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/TransformerRegistryFactory.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/resources/
aries/branches/subsystemsR6/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java
aries/branches/subsystemsR6/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/parsing/
aries/branches/subsystemsR6/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/util/
aries/branches/subsystemsR6/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/weaving/
aries/branches/subsystemsR6/jpa/jpa-container/src/test/java/org/apache/aries/util/
aries/branches/subsystemsR6/jpa/jpa-container/src/test/resources/
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxElementHandler.java
aries/branches/subsystemsR6/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/HOWLLog.java
aries/branches/subsystemsR6/versioning/versioning-checker/src/test/java/org/apache/aries/versioning/impl/
Modified:
aries/branches/subsystemsR6/ (props changed)
aries/branches/subsystemsR6/application/application-itests/pom.xml
aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java
aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
aries/branches/subsystemsR6/blueprint/blueprint-authz/pom.xml
aries/branches/subsystemsR6/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/AuthorizationNsHandler.java
aries/branches/subsystemsR6/blueprint/blueprint-bundle/pom.xml
aries/branches/subsystemsR6/blueprint/blueprint-cm/pom.xml
aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedProperties.java
aries/branches/subsystemsR6/blueprint/blueprint-core/pom.xml
aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AbstractServiceReferenceRecipe.java
aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ReferenceRecipe.java
aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java
aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/services/ExtendedBlueprintContainer.java
aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml
aries/branches/subsystemsR6/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BPQuiesceTest.java
aries/branches/subsystemsR6/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/ReflectionUtilsTest.java
aries/branches/subsystemsR6/blueprint/blueprint-itests/pom.xml
aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerUseSystemContextTest.java
aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/ManagedServiceFactoryTest.java
aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/ManagedServiceFactoryUseSystemBundleTest.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/ (props changed)
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/pom.xml
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Context.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Matcher.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/GeneratorTest.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/ContextTest.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/PropertyTest.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean1.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean3.java
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferences.java
aries/branches/subsystemsR6/blueprint/blueprint-noosgi/pom.xml
aries/branches/subsystemsR6/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
aries/branches/subsystemsR6/blueprint/blueprint-web/pom.xml
aries/branches/subsystemsR6/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java
aries/branches/subsystemsR6/jmx/jmx-core-whiteboard/pom.xml
aries/branches/subsystemsR6/jmx/jmx-core/pom.xml
aries/branches/subsystemsR6/jmx/jmx-core/src/main/java/org/apache/aries/jmx/agent/JMXAgentImpl.java
aries/branches/subsystemsR6/jpa/jpa-api/pom.xml
aries/branches/subsystemsR6/jpa/jpa-container-eclipselink-adapter/pom.xml
aries/branches/subsystemsR6/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/Activator.java
aries/branches/subsystemsR6/jpa/jpa-container/pom.xml
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/JPAWeavingHook.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/TransformerRegistry.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/WrappingTransformer.java
aries/branches/subsystemsR6/jpa/pom.xml
aries/branches/subsystemsR6/parent/pom.xml
aries/branches/subsystemsR6/pom.xml
aries/branches/subsystemsR6/spi-fly/pom.xml
aries/branches/subsystemsR6/spi-fly/spi-fly-core/pom.xml
aries/branches/subsystemsR6/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
aries/branches/subsystemsR6/spi-fly/spi-fly-dynamic-bundle/pom.xml
aries/branches/subsystemsR6/spi-fly/spi-fly-static-bundle/pom.xml
aries/branches/subsystemsR6/spi-fly/spi-fly-static-tool/pom.xml
aries/branches/subsystemsR6/subsystem/pom.xml
aries/branches/subsystemsR6/subsystem/subsystem-api/pom.xml
aries/branches/subsystemsR6/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/packageinfo
aries/branches/subsystemsR6/subsystem/subsystem-bundle/pom.xml
aries/branches/subsystemsR6/subsystem/subsystem-core/pom.xml
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/StartAction.java
aries/branches/subsystemsR6/subsystem/subsystem-install/pom.xml
aries/branches/subsystemsR6/subsystem/subsystem-itests/pom.xml
aries/branches/subsystemsR6/subsystem/subsystem-obr/pom.xml
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/BundleWideTxData.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/BundleWideTxDataUtil.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/Constants.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/MatchedTxData.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionAttribute.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionToken.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelper.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelperImpl.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/AnnotationParser.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxBlueprintListener.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/main/resources/OSGI-INF/blueprint/transaction.xml
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/AnnotationEnablingNameSpaceHandlerTest.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/AnnotationParserTest.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BundleWideNameSpaceHandlerTest.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/NameSpaceHandlerTest.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/TranStrategyTest.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/pojo/BadlyAnnotatedPojo2.java
aries/branches/subsystemsR6/transaction/transaction-itests/pom.xml
aries/branches/subsystemsR6/transaction/transaction-jdbc/pom.xml
aries/branches/subsystemsR6/transaction/transaction-manager/pom.xml
aries/branches/subsystemsR6/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/Activator.java
aries/branches/subsystemsR6/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesPlatformTransactionManager.java
aries/branches/subsystemsR6/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java
aries/branches/subsystemsR6/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogTest.java
aries/branches/subsystemsR6/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/BundleCompatibility.java
aries/branches/subsystemsR6/versioning/versioning-plugin/src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java
Propchange: aries/branches/subsystemsR6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 9 15:33:24 2015
@@ -1,2 +1,2 @@
/aries/branches/1.0-prototype:1306564-1337594
-/aries/trunk:1535830-1653939
+/aries/trunk:1535830-1684406
Modified: aries/branches/subsystemsR6/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-itests/pom.xml?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-itests/pom.xml (original)
+++ aries/branches/subsystemsR6/application/application-itests/pom.xml Tue Jun 9 15:33:24 2015
@@ -43,6 +43,11 @@
<url>http://svn.apache.org/viewvc/aries/trunk/application/application-itests</url>
</scm>
+ <properties>
+ <exam.version>4.5.0</exam.version>
+ <url.version>2.2.0</url.version>
+ </properties>
+
<dependencies>
<!-- framework -->
<dependency>
@@ -73,31 +78,31 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>3.4.0</version>
+ <version>${exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>3.4.0</version>
+ <version>${exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-native</artifactId>
- <version>3.4.0</version>
+ <version>${exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
- <version>3.4.0</version>
+ <version>${exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>1.6.0</version>
+ <version>${url.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java (original)
+++ aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java Tue Jun 9 15:33:24 2015
@@ -147,8 +147,6 @@ public class BasicAppManagerTest extends
return options(
// framework / core bundles
- mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
Modified: aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java (original)
+++ aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java Tue Jun 9 15:33:24 2015
@@ -124,7 +124,6 @@ public class BasicNoOpResolverTest exten
// framework / core bundles
mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
@@ -134,7 +133,6 @@ public class BasicNoOpResolverTest exten
// Bundles
junitBundles(),
mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").versionAsInProject(),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils").versionAsInProject(),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management").versionAsInProject(),
Modified: aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java (original)
+++ aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java Tue Jun 9 15:33:24 2015
@@ -367,7 +367,6 @@ public class IsolatedCfgAdminRuntimeTest
// framework / core bundles
mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
Modified: aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java (original)
+++ aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java Tue Jun 9 15:33:24 2015
@@ -315,7 +315,6 @@ public class IsolatedRuntimeTest extends
// framework / core bundles
mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
Modified: aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java (original)
+++ aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java Tue Jun 9 15:33:24 2015
@@ -174,7 +174,6 @@ public class MinimumImportsTest extends
// framework / core bundles
mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
Modified: aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java (original)
+++ aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java Tue Jun 9 15:33:24 2015
@@ -155,7 +155,6 @@ public class OBRAppManagerTest extends A
// framework / core bundles
mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
Modified: aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java (original)
+++ aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java Tue Jun 9 15:33:24 2015
@@ -532,7 +532,6 @@ public class OBRResolverAdvancedTest ext
// framework / core bundles
mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
Modified: aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java (original)
+++ aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java Tue Jun 9 15:33:24 2015
@@ -318,7 +318,6 @@ public class OBRResolverTest extends Abs
// framework / core bundles
mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
Modified: aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java (original)
+++ aries/branches/subsystemsR6/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java Tue Jun 9 15:33:24 2015
@@ -256,7 +256,6 @@ public class UpdateAppTest extends Abstr
// framework / core bundles
mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
Modified: aries/branches/subsystemsR6/blueprint/blueprint-authz/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-authz/pom.xml?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-authz/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-authz/pom.xml Tue Jun 9 15:33:24 2015
@@ -69,12 +69,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- <scope>test</scope>
- <version>1.0.0</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
Modified: aries/branches/subsystemsR6/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/AuthorizationNsHandler.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/AuthorizationNsHandler.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/AuthorizationNsHandler.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/AuthorizationNsHandler.java Tue Jun 9 15:33:24 2015
@@ -53,8 +53,7 @@ public class AuthorizationNsHandler impl
public ComponentMetadata decorate(Node node, ComponentMetadata cm, ParserContext pc) {
if (node instanceof Element) {
- Element elt = (Element)node;
- parseElement(elt, cm, pc);
+ parseElement((Element)node, cm, pc);
}
return cm;
}
Modified: aries/branches/subsystemsR6/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-bundle/pom.xml?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-bundle/pom.xml Tue Jun 9 15:33:24 2015
@@ -122,13 +122,13 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>1.0.6-SNAPSHOT</version>
+ <version>1.0.7-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -221,6 +221,13 @@
<plugin>
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.plugin</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
+ <configuration>
+ <excludes>
+ <exclude>method org.apache.aries.blueprint.di.Repository getRepository() has been deleted</exclude>
+ </excludes>
+ </configuration>
+
<executions>
<execution>
<id>default-verify</id>
Modified: aries/branches/subsystemsR6/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-cm/pom.xml?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-cm/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-cm/pom.xml Tue Jun 9 15:33:24 2015
@@ -31,7 +31,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
<packaging>bundle</packaging>
- <version>1.0.6-SNAPSHOT</version>
+ <version>1.0.7-SNAPSHOT</version>
<name>Apache Aries Blueprint CM</name>
<description>
This bundle contains the ConfigAdmin namespace for blueprint.
Modified: aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedProperties.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedProperties.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedProperties.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedProperties.java Tue Jun 9 15:33:24 2015
@@ -141,6 +141,7 @@ public class CmManagedProperties impleme
if (config != null) {
properties = config.getProperties();
}
+ updated(properties);
}
}
@@ -212,28 +213,7 @@ public class CmManagedProperties impleme
methods.addAll(Arrays.asList(bean.getClass().getDeclaredMethods()));
for (Method method : methods) {
if (method.getName().equals(setterName)) {
- if (method.getParameterTypes().length == 0) {
- LOGGER.debug("Setter takes no parameters: {}", method);
- continue;
- }
- if (method.getParameterTypes().length > 1) {
- LOGGER.debug("Setter takes more than one parameter: {}", method);
- continue;
- }
- if (method.getReturnType() != Void.TYPE) {
- LOGGER.debug("Setter returns a value: {}", method);
- continue;
- }
- if (Modifier.isAbstract(method.getModifiers())) {
- LOGGER.debug("Setter is abstract: {}", method);
- continue;
- }
- if (!Modifier.isPublic(method.getModifiers())) {
- LOGGER.debug("Setter is not public: {}", method);
- continue;
- }
- if (Modifier.isStatic(method.getModifiers())) {
- LOGGER.debug("Setter is static: {}", method);
+ if (shouldSkip(method)) {
continue;
}
Class methodParameterType = method.getParameterTypes()[0];
@@ -283,6 +263,29 @@ public class CmManagedProperties impleme
}
}
+ private boolean shouldSkip(Method method) {
+ String msg = null;
+ if (method.getParameterTypes().length == 0) {
+ msg = "takes no parameters";
+ } else if (method.getParameterTypes().length > 1) {
+ msg = "takes more than one parameter";
+ } else if (method.getReturnType() != Void.TYPE) {
+ msg = "returns a value";
+ } else if (Modifier.isAbstract(method.getModifiers())) {
+ msg = "is abstract";
+ } else if (!Modifier.isPublic(method.getModifiers())) {
+ msg = "is not public";
+ } else if (Modifier.isStatic(method.getModifiers())) {
+ msg = "is static";
+ }
+ if (msg != null) {
+ LOGGER.debug("Skipping setter {} because it " + msg, method);
+ return true;
+ } else {
+ return false;
+ }
+ }
+
private static Throwable getRealCause(Throwable t) {
if (t instanceof InvocationTargetException && t.getCause() != null) {
return t.getCause();
Modified: aries/branches/subsystemsR6/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-core/pom.xml?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-core/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-core/pom.xml Tue Jun 9 15:33:24 2015
@@ -32,7 +32,7 @@
<artifactId>org.apache.aries.blueprint.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Blueprint Core</name>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
<description>
This bundle contains the core implementation of Blueprint
along with the "ext" namespace handler.
@@ -169,9 +169,9 @@
<version>${quiesce.api.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>1.0.0</version>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -232,6 +232,12 @@
<plugin>
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.plugin</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
+ <configuration>
+ <excludes>
+ <exclude>method org.apache.aries.blueprint.di.Repository getRepository() has been deleted</exclude>
+ </excludes>
+ </configuration>
<executions>
<execution>
<id>default-verify</id>
Modified: aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AbstractServiceReferenceRecipe.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AbstractServiceReferenceRecipe.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AbstractServiceReferenceRecipe.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AbstractServiceReferenceRecipe.java Tue Jun 9 15:33:24 2015
@@ -71,6 +71,7 @@ import org.slf4j.LoggerFactory;
*
* @version $Rev$, $Date$
*/
+@SuppressWarnings("rawtypes")
public abstract class AbstractServiceReferenceRecipe extends AbstractRecipe implements ServiceListener, SatisfiableRecipe {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractServiceReferenceRecipe.class);
@@ -112,12 +113,7 @@ public abstract class AbstractServiceRef
this.optional = (metadata.getAvailability() == ReferenceMetadata.AVAILABILITY_OPTIONAL);
this.filter = createOsgiFilter(metadata, null);
- if (System.getSecurityManager() != null) {
- accessControlContext = createAccessControlContext();
- } else
- {
- accessControlContext = null;
- }
+ accessControlContext = (System.getSecurityManager() != null) ? createAccessControlContext() : null;
}
@@ -233,63 +229,61 @@ public abstract class AbstractServiceRef
return null;
}
- protected Object getServiceSecurely(final ServiceReference serviceReference) {
- if (accessControlContext == null) {
- return getBundleContextForServiceLookup().getService(
- serviceReference);
-
- } else {
- // If we're operating with security, use the privileges of the bundle
- // we're managing to do the lookup
- return AccessController.doPrivileged(
- new PrivilegedAction<Object>() {
- public Object run() {
- return getBundleContextForServiceLookup()
- .getService(serviceReference);
- }
- }, accessControlContext);
- }
- }
-
+ @SuppressWarnings("unchecked")
+ protected Object getServiceSecurely(final ServiceReference serviceReference) {
+ if (accessControlContext == null) {
+ return getBundleContextForServiceLookup().getService(serviceReference);
+ } else {
+ // If we're operating with security, use the privileges of the bundle
+ // we're managing to do the lookup
+ return AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ public Object run() {
+ return getBundleContextForServiceLookup().getService(serviceReference);
+ }
+ }, accessControlContext);
+ }
+ }
- /**
- * We may need to execute code within a doPrivileged block, and if so, it should be the
- * privileges of the bundle with the blueprint file that get used, not the privileges
- * of blueprint-core. To achieve this we use an access context.
- * @return
- */
+ /**
+ * We may need to execute code within a doPrivileged block, and if so, it should be the privileges of the
+ * bundle with the blueprint file that get used, not the privileges of blueprint-core. To achieve this we
+ * use an access context.
+ *
+ * @return
+ */
private AccessControlContext createAccessControlContext() {
- return new AccessControlContext(AccessController.getContext(),
- new DomainCombiner() {
- public ProtectionDomain[] combine(ProtectionDomain[] arg0,
- ProtectionDomain[] arg1) {
- return new ProtectionDomain[] { new ProtectionDomain(null, null) {
- public boolean implies(Permission permission) {
- return getBundleContextForServiceLookup().getBundle().hasPermission(permission);
- }
- }
- };
- }
+ return new AccessControlContext(AccessController.getContext(), new DomainCombiner() {
+ public ProtectionDomain[] combine(ProtectionDomain[] arg0, ProtectionDomain[] arg1) {
+ ProtectionDomain protectionDomain = new ProtectionDomain(null, null) {
+ public boolean implies(Permission permission) {
+ return getBundleContextForServiceLookup().getBundle().hasPermission(permission);
+ }
+ };
+ return new ProtectionDomain[] {
+ protectionDomain
+ };
+ }
});
}
+ @SuppressWarnings("unchecked")
protected void createListeners() {
- if (listenersRecipe != null) {
- List<Listener> listeners = (List<Listener>) listenersRecipe.create();
- for (Listener listener : listeners) {
- List<Class> classList = new ArrayList<Class>();
- Class clz = getInterfaceClass();
- if (clz != null) {
- classList.add(clz);
- } else {
- classList.add(Object.class);
- }
- listener.init(classList);
+ if (listenersRecipe != null) {
+ List<Listener> listeners = (List<Listener>)listenersRecipe.create();
+ for (Listener listener : listeners) {
+ List<Class> classList = new ArrayList<Class>();
+ Class clz = getInterfaceClass();
+ if (clz != null) {
+ classList.add(clz);
+ } else {
+ classList.add(Object.class);
}
- this.listeners = listeners;
- } else {
- this.listeners = Collections.emptyList();
+ listener.init(classList);
}
+ this.listeners = listeners;
+ } else {
+ this.listeners = Collections.emptyList();
+ }
}
protected List<Class<?>> loadAllClasses(Iterable<String> interfaceNames) {
Modified: aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ReferenceRecipe.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ReferenceRecipe.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ReferenceRecipe.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ReferenceRecipe.java Tue Jun 9 15:33:24 2015
@@ -52,6 +52,7 @@ import org.slf4j.LoggerFactory;
*
* @version $Rev$, $Date$
*/
+@SuppressWarnings("rawtypes")
public class ReferenceRecipe extends AbstractServiceReferenceRecipe {
private static final Logger LOGGER = LoggerFactory.getLogger(ReferenceRecipe.class);
@@ -206,7 +207,7 @@ public class ReferenceRecipe extends Abs
if (isStarted() && trackedServiceReference == null && metadata.getTimeout() > 0
&& metadata.getAvailability() == ServiceReferenceMetadata.AVAILABILITY_MANDATORY) {
//Here we want to get the blueprint bundle itself, so don't use #getBundleContextForServiceLookup()
- blueprintContainer.getEventDispatcher().blueprintEvent(new BlueprintEvent(BlueprintEvent.WAITING, blueprintContainer.getBundleContext().getBundle(), blueprintContainer.getExtenderBundle(), new String[] { getOsgiFilter() }));
+ blueprintContainer.getEventDispatcher().blueprintEvent(createWaitingevent());
monitor.wait(metadata.getTimeout());
}
Object result = null;
@@ -255,6 +256,13 @@ public class ReferenceRecipe extends Abs
}
}
+ private BlueprintEvent createWaitingevent() {
+ return new BlueprintEvent(BlueprintEvent.WAITING,
+ blueprintContainer.getBundleContext().getBundle(),
+ blueprintContainer.getExtenderBundle(),
+ new String[] { getOsgiFilter() });
+ }
+
private ServiceReference getServiceReference() throws InterruptedException {
synchronized (monitor) {
if (!optional) {
Modified: aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java Tue Jun 9 15:33:24 2015
@@ -75,6 +75,7 @@ public class ExtNamespaceHandler impleme
public static final String BLUEPRINT_EXT_NAMESPACE_V1_2 = "http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.2.0";
public static final String BLUEPRINT_EXT_NAMESPACE_V1_3 = "http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.3.0";
public static final String BLUEPRINT_EXT_NAMESPACE_V1_4 = "http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.4.0";
+ public static final String BLUEPRINT_EXT_NAMESPACE_V1_5 = "http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.5.0";
public static final String PROPERTY_PLACEHOLDER_ELEMENT = "property-placeholder";
public static final String DEFAULT_PROPERTIES_ELEMENT = "default-properties";
@@ -110,6 +111,10 @@ public class ExtNamespaceHandler impleme
public static final String ADDITIONAL_INTERFACES = "additional-interfaces";
public static final String INTERFACE_VALUE = "value";
+
+ public static final String BEAN = "bean";
+ public static final String REFERENCE = "reference";
+
private static final Logger LOGGER = LoggerFactory.getLogger(ExtNamespaceHandler.class);
@@ -132,6 +137,8 @@ public class ExtNamespaceHandler impleme
return getClass().getResource("blueprint-ext-1.3.xsd");
} else if (BLUEPRINT_EXT_NAMESPACE_V1_4.equals(namespace)) {
return getClass().getResource("blueprint-ext-1.4.xsd");
+ } else if (BLUEPRINT_EXT_NAMESPACE_V1_5.equals(namespace)) {
+ return getClass().getResource("blueprint-ext-1.5.xsd");
} else if ("http://www.w3.org/XML/1998/namespace".equals(namespace)) {
return getClass().getResource("xml.xsd");
}
@@ -142,7 +149,8 @@ public class ExtNamespaceHandler impleme
|| BLUEPRINT_EXT_NAMESPACE_V1_1.equals(e)
|| BLUEPRINT_EXT_NAMESPACE_V1_2.equals(e)
|| BLUEPRINT_EXT_NAMESPACE_V1_3.equals(e)
- || BLUEPRINT_EXT_NAMESPACE_V1_4.equals(e);
+ || BLUEPRINT_EXT_NAMESPACE_V1_4.equals(e)
+ || BLUEPRINT_EXT_NAMESPACE_V1_5.equals(e);
}
public Set<Class> getManagedClasses() {
@@ -155,6 +163,11 @@ public class ExtNamespaceHandler impleme
LOGGER.debug("Parsing element {{}}{}", element.getNamespaceURI(), element.getLocalName());
if (nodeNameEquals(element, PROPERTY_PLACEHOLDER_ELEMENT)) {
return parsePropertyPlaceholder(context, element);
+ } else if (nodeNameEquals(element, BEAN)) {
+ return context.parseElement(BeanMetadata.class, context.getEnclosingComponent(), element);
+ } else if (nodeNameEquals(element, REFERENCE)) {
+ RefMetadata rd = context.parseElement(RefMetadata.class, context.getEnclosingComponent(), element);
+ return createReference(context, rd.getComponentId());
} else {
throw new ComponentDefinitionException("Unsupported element: " + element.getNodeName());
}
@@ -173,6 +186,11 @@ public class ExtNamespaceHandler impleme
return decorateFilter(node, component, context);
} else if (node instanceof Element && nodeNameEquals(node, ADDITIONAL_INTERFACES)) {
return decorateAdditionalInterfaces(node, component, context);
+ } else if (node instanceof Element && nodeNameEquals(node, BEAN)) {
+ return context.parseElement(BeanMetadata.class, component, (Element)node);
+ } else if (node instanceof Element && nodeNameEquals(node, REFERENCE)) {
+ RefMetadata rd = context.parseElement(RefMetadata.class, component, (Element)node);
+ return createReference(context, rd.getComponentId());
} else {
throw new ComponentDefinitionException("Unsupported node: " + node.getNodeName());
}
Modified: aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/services/ExtendedBlueprintContainer.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/services/ExtendedBlueprintContainer.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/services/ExtendedBlueprintContainer.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/services/ExtendedBlueprintContainer.java Tue Jun 9 15:33:24 2015
@@ -56,12 +56,6 @@ public interface ExtendedBlueprintContai
<T extends Processor> List<T> getProcessors(Class<T> type);
- /**
- * To be removed as internal API
- */
- @Deprecated
- Repository getRepository();
-
ServiceRegistration registerService(String[] classes, Object service, Dictionary properties);
Object getService(ServiceReference reference);
Modified: aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml Tue Jun 9 15:33:24 2015
@@ -47,6 +47,11 @@
<entry key="osgi.service.blueprint.namespace" value="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.4.0"/>
</service-properties>
</service>
+ <service ref="ExtNamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
+ <service-properties>
+ <entry key="osgi.service.blueprint.namespace" value="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.5.0"/>
+ </service-properties>
+ </service>
<!-- Also provide the "xml" namespace as a core functionality to avoid many bundles registering a handler for this -->
<service ref="ExtNamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
Modified: aries/branches/subsystemsR6/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BPQuiesceTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BPQuiesceTest.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BPQuiesceTest.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BPQuiesceTest.java Tue Jun 9 15:33:24 2015
@@ -18,28 +18,28 @@
*/
package org.apache.aries.blueprint.container;
+import static junit.framework.Assert.assertTrue;
+
import java.util.Arrays;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import org.apache.aries.quiesce.manager.QuiesceCallback;
-import org.apache.aries.unittest.mocks.MethodCall;
-import org.apache.aries.unittest.mocks.Skeleton;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-import static junit.framework.Assert.*;
-
public class BPQuiesceTest {
@Test
public void canQuiesceNoBPBundle() throws Exception {
- BundleContext ctx = Skeleton.newMock(BundleContext.class);
- Bundle bpBundle = Skeleton.newMock(Bundle.class);
- Bundle testBundle = Skeleton.newMock(Bundle.class);
+ IMocksControl c = EasyMock.createControl();
+ BundleContext ctx = c.createMock(BundleContext.class);
+ Bundle bpBundle = c.createMock(Bundle.class);
+ Bundle testBundle = c.createMock(Bundle.class);
- Skeleton.getSkeleton(ctx).setReturnValue(
- new MethodCall(BundleContext.class, "getBundle"), bpBundle);
+ EasyMock.expect(ctx.getBundle()).andReturn(bpBundle);
BlueprintQuiesceParticipant bqp = new BlueprintQuiesceParticipant(ctx, new BlueprintExtender() {
@Override
@@ -55,9 +55,9 @@ public class BPQuiesceTest {
result.release();
}
};
-
+ c.replay();
bqp.quiesce(qc, Arrays.asList(testBundle));
-
+ c.verify();
assertTrue(result.tryAcquire(2, TimeUnit.SECONDS));
}
}
Modified: aries/branches/subsystemsR6/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/ReflectionUtilsTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/ReflectionUtilsTest.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/ReflectionUtilsTest.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/ReflectionUtilsTest.java Tue Jun 9 15:33:24 2015
@@ -18,6 +18,10 @@
*/
package org.apache.aries.blueprint.utils;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -29,29 +33,22 @@ import java.util.List;
import java.util.Queue;
import java.util.concurrent.Future;
-import org.apache.aries.blueprint.services.ExtendedBlueprintContainer;
import org.apache.aries.blueprint.di.CircularDependencyException;
import org.apache.aries.blueprint.di.ExecutionContext;
import org.apache.aries.blueprint.di.Recipe;
+import org.apache.aries.blueprint.services.ExtendedBlueprintContainer;
import org.apache.aries.blueprint.utils.ReflectionUtils.PropertyDescriptor;
-import org.apache.aries.unittest.mocks.Skeleton;
+import org.easymock.Capture;
+import org.easymock.EasyMock;
+import org.easymock.IAnswer;
import org.junit.BeforeClass;
import org.junit.Test;
import org.osgi.service.blueprint.container.ComponentDefinitionException;
import org.osgi.service.blueprint.container.ReifiedType;
-import static org.junit.Assert.*;
-
public class ReflectionUtilsTest {
private PropertyDescriptor[] sut;
- private final ExtendedBlueprintContainer mockBlueprint = Skeleton.newMock(
- new Object() {
- public Class<?> loadClass(String name) throws ClassNotFoundException {
- return Thread.currentThread().getContextClassLoader().loadClass(name);
- }
- },
- ExtendedBlueprintContainer.class);
-
+ private static ExtendedBlueprintContainer mockBlueprint;
public static class GetterOnly {
public String getValue() { return "test"; }
}
@@ -59,8 +56,17 @@ public class ReflectionUtilsTest {
private class Inconvertible {}
@BeforeClass
- public static void before()
+ public static void before() throws ClassNotFoundException
{
+ mockBlueprint = EasyMock.createNiceMock(ExtendedBlueprintContainer.class);
+ final Capture<String> nameCapture = new Capture<String>();
+ EasyMock.expect(mockBlueprint.loadClass(EasyMock.capture(nameCapture))).andAnswer(new IAnswer<Class<?>>() {
+ public Class<?> answer() throws Throwable {
+ return Thread.currentThread().getContextClassLoader().loadClass(nameCapture.getValue());
+ }
+ });
+ EasyMock.replay(mockBlueprint);
+
ExecutionContext.Holder.setContext(new ExecutionContext() {
public void addPartialObject(String name, Object object) {}
public boolean containsObject(String name) { return false; }
Modified: aries/branches/subsystemsR6/blueprint/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-itests/pom.xml?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-itests/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-itests/pom.xml Tue Jun 9 15:33:24 2015
@@ -44,8 +44,8 @@
</scm>
<properties>
- <exam.version>3.4.0</exam.version>
- <url.version>1.6.0</url.version>
+ <exam.version>4.5.0</exam.version>
+ <url.version>2.2.0</url.version>
</properties>
<dependencies>
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>1.0.6-SNAPSHOT</version>
+ <version>1.0.7-SNAPSHOT</version>
<type>bundle</type>
<scope>compile</scope>
<exclusions>
Modified: aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerUseSystemContextTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerUseSystemContextTest.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerUseSystemContextTest.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerUseSystemContextTest.java Tue Jun 9 15:33:24 2015
@@ -18,7 +18,6 @@
*/
package org.apache.aries.blueprint.itests;
-import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
import static org.junit.Assert.assertNotNull;
import java.util.Collection;
@@ -38,6 +37,9 @@ import org.osgi.framework.ServiceRegistr
import org.osgi.framework.hooks.bundle.EventHook;
import org.osgi.framework.hooks.bundle.FindHook;
+/**
+ * Shows that the blueprint extender uses the system bundle to find user bundles if the respective property is set
+ */
public class BlueprintContainerUseSystemContextTest extends AbstractBlueprintIntegrationTest {
ServiceRegistration eventHook;
Modified: aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java?rev=1684451&r1=1684450&r2=1684451&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java Tue Jun 9 15:33:24 2015
@@ -21,6 +21,8 @@ package org.apache.aries.blueprint.itest
import java.util.Currency;
import java.util.Hashtable;
+import javax.inject.Inject;
+
import org.apache.aries.blueprint.sample.Foo;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,6 +31,7 @@ import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerMethod;
import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleException;
import org.osgi.framework.ServiceReference;
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.cm.Configuration;
@@ -42,105 +45,56 @@ import static org.ops4j.pax.exam.CoreOpt
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerMethod.class)
public class TestConfigAdmin extends AbstractBlueprintIntegrationTest {
+ @Inject
+ ConfigurationAdmin ca;
@Test
public void testStrategyNone() throws Exception {
- ConfigurationAdmin ca = context().getService(ConfigurationAdmin.class);
- Configuration cf = ca.getConfiguration("blueprint-sample-managed.none", null);
- Hashtable<String,String> props = new Hashtable<String,String>();
- props.put("a", "5");
- props.put("currency", "PLN");
- cf.update(props);
-
- Bundle bundle = context().getBundleByName("org.apache.aries.blueprint.sample");
- assertNotNull(bundle);
- bundle.start();
-
- BlueprintContainer blueprintContainer = Helper.getBlueprintContainerForBundle(context(), "org.apache.aries.blueprint.sample");
- assertNotNull(blueprintContainer);
-
- Foo foo = (Foo) blueprintContainer.getComponentInstance("none-managed");
- assertNotNull(foo);
+ ca.getConfiguration("blueprint-sample-managed.none", null).update(getConfig1());
+ startTestBundle();
+ // foo should receive initial configuration
+ Foo foo = getComponent("none-managed");
assertEquals(5, foo.getA());
assertEquals(Currency.getInstance("PLN"), foo.getCurrency());
- props = new Hashtable<String,String>();
- props.put("a", "10");
- props.put("currency", "USD");
- cf = ca.getConfiguration("blueprint-sample-managed.none", null);
- cf.update(props);
-
+ // foo should not reflect changes in config
+ ca.getConfiguration("blueprint-sample-managed.none", null).update(getConfig2());
Thread.sleep(100);
-
assertEquals(5, foo.getA());
assertEquals(Currency.getInstance("PLN"), foo.getCurrency());
}
- @Test
- public void testStrategyContainer() throws Exception {
- ConfigurationAdmin ca = context().getService(ConfigurationAdmin.class);
- Configuration cf = ca.getConfiguration("blueprint-sample-managed.container", null);
- Hashtable<String,String> props = new Hashtable<String,String>();
- props.put("a", "5");
- props.put("currency", "PLN");
- cf.update(props);
- Bundle bundle = context().getBundleByName("org.apache.aries.blueprint.sample");
- assertNotNull(bundle);
- bundle.start();
-
- BlueprintContainer blueprintContainer = Helper.getBlueprintContainerForBundle(context(), "org.apache.aries.blueprint.sample");
- assertNotNull(blueprintContainer);
-
- Foo foo = (Foo) blueprintContainer.getComponentInstance("container-managed");
- assertNotNull(foo);
+ @Test
+ public void testStrategyContainer() throws Exception {
+ // foo should have received initial configuration
+ ca.getConfiguration("blueprint-sample-managed.container", null).update(getConfig1());
+ startTestBundle();
+ Foo foo = getComponent("container-managed");
assertEquals(5, foo.getA());
assertEquals(Currency.getInstance("PLN"), foo.getCurrency());
- props = new Hashtable<String,String>();
- props.put("a", "10");
- props.put("currency", "USD");
- cf.update(props);
-
+ // foo bean properties should have been updated
+ ca.getConfiguration("blueprint-sample-managed.container", null).update(getConfig2());
Thread.sleep(100);
-
assertEquals(10, foo.getA());
assertEquals(Currency.getInstance("USD"), foo.getCurrency());
}
@Test
public void testStrategyComponent() throws Exception {
- ConfigurationAdmin ca = context().getService(ConfigurationAdmin.class);
- Configuration cf = ca.getConfiguration("blueprint-sample-managed.component", null);
- Hashtable<String,String> props = new Hashtable<String,String>();
- props.put("a", "5");
- props.put("currency", "PLN");
- cf.update(props);
-
- Thread.sleep(2000);
-
- Bundle bundle = context().getBundleByName("org.apache.aries.blueprint.sample");
- assertNotNull(bundle);
- bundle.start();
-
- BlueprintContainer blueprintContainer = Helper.getBlueprintContainerForBundle(context(), "org.apache.aries.blueprint.sample");
- assertNotNull(blueprintContainer);
-
- Foo foo = (Foo) blueprintContainer.getComponentInstance("component-managed");
- assertNotNull(foo);
-
+ // foo should receive initial configuration
+ ca.getConfiguration("blueprint-sample-managed.component", null).update(getConfig1());
+ startTestBundle();
+ Foo foo = getComponent("component-managed");
assertEquals(5, foo.getA());
assertEquals(Currency.getInstance("PLN"), foo.getCurrency());
- props = new Hashtable<String,String>();
- props.put("a", "10");
- props.put("currency", "USD");
- cf.update(props);
-
+ // Foo.update() should have been called but the bean properties should not have been updated
+ ca.getConfiguration("blueprint-sample-managed.component", null).update(getConfig2());
Thread.sleep(100);
-
assertEquals(5, foo.getA());
assertEquals(Currency.getInstance("PLN"), foo.getCurrency());
assertNotNull(foo.getProps());
@@ -151,32 +105,47 @@ public class TestConfigAdmin extends Abs
@SuppressWarnings("rawtypes")
@Test
public void testManagedServiceFactory() throws Exception {
-
- ConfigurationAdmin ca = context().getService(ConfigurationAdmin.class);
Configuration cf = ca.createFactoryConfiguration("blueprint-sample-managed-service-factory", null);
- Hashtable<String,String> props = new Hashtable<String,String>();
- props.put("a", "5");
- props.put("currency", "PLN");
- cf.update(props);
+ cf.update(getConfig1());
+ startTestBundle();
- Bundle bundle = context().getBundleByName("org.apache.aries.blueprint.sample");
- assertNotNull(bundle);
- bundle.start();
-
- BlueprintContainer blueprintContainer = Helper.getBlueprintContainerForBundle(context(), "org.apache.aries.blueprint.sample");
- assertNotNull(blueprintContainer);
-
// Make sure only one service is registered
// Ask the service registry, not the container, since the container might have got it wrong :)
Foo foo = context().getService(Foo.class, "(service.pid=blueprint-sample-managed-service-factory.*)");
- assertNotNull(foo);
-
ServiceReference[] refs = context().getAllServiceReferences(Foo.class.getName(), "(service.pid=blueprint-sample-managed-service-factory.*)");
-
assertNotNull("No services were registered for the managed service factory", refs);
assertEquals("Multiple services were registered for the same pid.", 1, refs.length);
-
+ }
+ private Hashtable<String, String> getConfig1() {
+ Hashtable<String,String> props = new Hashtable<String,String>();
+ props.put("a", "5");
+ props.put("currency", "PLN");
+ return props;
+ }
+
+ private Hashtable<String, String> getConfig2() {
+ Hashtable<String, String> props;
+ props = new Hashtable<String,String>();
+ props.put("a", "10");
+ props.put("currency", "USD");
+ return props;
+ }
+
+ private <T>T getComponent(String componentId) {
+ BlueprintContainer blueprintContainer = Helper.getBlueprintContainerForBundle(context(), "org.apache.aries.blueprint.sample");
+ assertNotNull(blueprintContainer);
+
+ @SuppressWarnings("unchecked")
+ T component = (T)blueprintContainer.getComponentInstance(componentId);
+ assertNotNull(component);
+ return component;
+ }
+
+ private void startTestBundle() throws BundleException {
+ Bundle bundle = context().getBundleByName("org.apache.aries.blueprint.sample");
+ assertNotNull(bundle);
+ bundle.start();
}
@org.ops4j.pax.exam.Configuration