Author: tjwatson
Date: Wed Jan 7 19:37:42 2015
New Revision: 1650143
URL: http://svn.apache.org/r1650143
Log:
Merged latest trunk into subsystemsR6
Added:
aries/branches/subsystemsR6/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/AuthorizationBeanProcessor.java
- copied unchanged from r1649881,
aries/trunk/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/AuthorizationBeanProcessor.java
aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/resources/IgnoreUnknownNamespaceTest.xml
- copied unchanged from r1649881,
aries/trunk/blueprint/blueprint-itests/src/test/resources/IgnoreUnknownNamespaceTest.xml
aries/branches/subsystemsR6/blueprint/blueprint-maven-plugin/
- copied from r1649881, aries/trunk/blueprint/blueprint-maven-plugin/
aries/branches/subsystemsR6/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/AugmenterInvoker.java
- copied unchanged from r1649881,
aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/AugmenterInvoker.java
aries/branches/subsystemsR6/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/EnvironmentUnaugmentation.java
- copied unchanged from r1649881,
aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/EnvironmentUnaugmentation.java
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/AugmenterInvokerImpl.java
- copied unchanged from r1649881,
aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/AugmenterInvokerImpl.java
aries/branches/subsystemsR6/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/sync/
- copied from r1649881,
aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/sync/
aries/branches/subsystemsR6/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/JTAEntityManagerClose.java
- copied unchanged from r1649881,
aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/JTAEntityManagerClose.java
aries/branches/subsystemsR6/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/JTAEntityManagerHandler.java
- copied unchanged from r1649881,
aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/JTAEntityManagerHandler.java
aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerHibernateTest.java
- copied unchanged from r1649881,
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerHibernateTest.java
aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/AbstractQuiesceJPATest.java
- copied unchanged from r1649881,
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/AbstractQuiesceJPATest.java
aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/QuiesceJPAInteractionTest.java
- copied unchanged from r1649881,
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/QuiesceJPAInteractionTest.java
aries/branches/subsystemsR6/jpa/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/sql/
- copied from r1649881,
aries/trunk/jpa/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/sql/
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/
- copied from r1649881,
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/
aries/branches/subsystemsR6/jpa/jpa-container/src/main/resources/org/apache/aries/jpa/container/parsing/impl/persistence_2_1.xsd.rsrc
- copied unchanged from r1649881,
aries/trunk/jpa/jpa-container/src/main/resources/org/apache/aries/jpa/container/parsing/impl/persistence_2_1.xsd.rsrc
aries/branches/subsystemsR6/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/ContentHandler.java
- copied unchanged from r1649881,
aries/trunk/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/ContentHandler.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/content/
- copied from r1649881,
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/content/
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/CustomResourceInstaller.java
- copied unchanged from r1649881,
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/CustomResourceInstaller.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/CustomResourceUninstaller.java
- copied unchanged from r1649881,
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/CustomResourceUninstaller.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/CustomResources.java
- copied unchanged from r1649881,
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/CustomResources.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/FileResource.java
- copied unchanged from r1649881,
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/FileResource.java
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/bundles/cmContentBundleZ/
- copied from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/bundles/cmContentBundleZ/
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/bundles/customContentBundleA/
- copied from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/bundles/customContentBundleA/
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/bundles/customContentBundleB/
- copied from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/bundles/customContentBundleB/
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/bundles/customContentBundleC/
- copied from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/bundles/customContentBundleC/
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/bundles/customContentBundleD/
- copied from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/bundles/customContentBundleD/
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/bundles/tb4/
- copied from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/bundles/tb4/
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/CompositeServiceTest.java
- copied unchanged from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/CompositeServiceTest.java
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ConfigAdminPropsFileContentHandlerTest.java
- copied unchanged from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ConfigAdminPropsFileContentHandlerTest.java
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/CustomContentHandlerTest.java
- copied unchanged from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/CustomContentHandlerTest.java
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemEventHandler.java
- copied unchanged from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemEventHandler.java
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/bundles/
- copied from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/bundles/
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/blueprint/OSGI-INF/blueprint/
- copied from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/resources/blueprint/OSGI-INF/blueprint/
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/cmContent/
- copied from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/resources/cmContent/
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/composite2/
- copied from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/resources/composite2/
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/customContent/
- copied from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/resources/customContent/
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/customContent1/
- copied from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/resources/customContent1/
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/customContent2/
- copied from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/resources/customContent2/
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/customContent3/
- copied from r1649881,
aries/trunk/subsystem/subsystem-itests/src/test/resources/customContent3/
aries/branches/subsystemsR6/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/
- copied from r1649881,
aries/trunk/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/
aries/branches/subsystemsR6/transaction/transaction-jdbc/src/main/resources/META-INF/
- copied from r1649881,
aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/
aries/branches/subsystemsR6/transaction/transaction-jdbc/src/main/resources/org.apache.aries.transaction.jdbc-2.0.xsd
- copied unchanged from r1649881,
aries/trunk/transaction/transaction-jdbc/src/main/resources/org.apache.aries.transaction.jdbc-2.0.xsd
aries/branches/subsystemsR6/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/Activator.java
- copied unchanged from r1649881,
aries/trunk/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/Activator.java
aries/branches/subsystemsR6/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/Activator.java
- copied unchanged from r1649881,
aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/Activator.java
Removed:
aries/branches/subsystemsR6/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/AnnotationParser.java
aries/branches/subsystemsR6/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/JTAEntityManager.java
aries/branches/subsystemsR6/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/SynchronizedEntityManagerWrapper.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/CoundownCallback.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/CountingEntityManagerFactory.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/DestroyCallback.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/EntityManagerWrapper.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/QuiesceParticipantImpl.java
aries/branches/subsystemsR6/jpa20/
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/bundles/blueprint/META-INF/MANIFEST.MF
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/bundles/blueprint/org/apache/aries/subsystem/itests/blueprint/BPHelloImpl.java
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/bundles/core.fragment/META-INF/MANIFEST.MF
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110110.xml
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110221.xml
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0-SNAPSHOT.xml
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20110621.xml
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20120529-1548.xml
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/OSGI-INF/blueprint/blueprint.xml
aries/branches/subsystemsR6/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/obr/internal/FelixCapabilityAdapter.java
aries/branches/subsystemsR6/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/obr/internal/FelixProperty.java
aries/branches/subsystemsR6/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/obr/internal/FelixRepositoryAdapter.java
aries/branches/subsystemsR6/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/obr/internal/FelixRequirementAdapter.java
aries/branches/subsystemsR6/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/obr/internal/FelixResourceAdapter.java
aries/branches/subsystemsR6/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/obr/internal/OsgiCapabilityAdapter.java
aries/branches/subsystemsR6/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/obr/internal/OsgiContentCapability.java
aries/branches/subsystemsR6/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/obr/internal/OsgiIdentityCapability.java
aries/branches/subsystemsR6/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/obr/internal/OsgiRequirementAdapter.java
aries/branches/subsystemsR6/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/obr/internal/OsgiResourceAdapter.java
aries/branches/subsystemsR6/transaction/transaction-jms/src/main/resources/OSGI-INF/blueprint/transaction-jms.xml
aries/branches/subsystemsR6/web/web-urlhandler/src/main/resources/OSGI-INF/blueprint/WARHandler.xml
Modified:
aries/branches/subsystemsR6/ (props changed)
aries/branches/subsystemsR6/blueprint/blueprint-authz/ (props changed)
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-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/SecurityAnotationParser.java
aries/branches/subsystemsR6/blueprint/blueprint-authz/src/test/java/org/apache/aries/blueprint/authorization/impl/SecurityAnnoationParserTest.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/BlueprintContainerImpl.java
aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
aries/branches/subsystemsR6/blueprint/blueprint-itests/pom.xml
aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceIgnoreUnknownNamespaceHandlerTest.java
aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/ManagedServiceFactoryUseSystemBundleTest.java
aries/branches/subsystemsR6/blueprint/blueprint-noosgi/ (props changed)
aries/branches/subsystemsR6/blueprint/blueprint-parser/pom.xml
aries/branches/subsystemsR6/blueprint/pom.xml
aries/branches/subsystemsR6/esa-maven-plugin/pom.xml
aries/branches/subsystemsR6/esa-maven-plugin/src/main/java/org/apache/aries/plugin/esa/ContentInfo.java
aries/branches/subsystemsR6/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/EsaMojoTest.java
aries/branches/subsystemsR6/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/stubs/EsaArtifactStub.java
aries/branches/subsystemsR6/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/stubs/EsaMavenProjectStub9.java
aries/branches/subsystemsR6/jndi/ (props changed)
aries/branches/subsystemsR6/jndi/jndi-api/pom.xml
aries/branches/subsystemsR6/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/packageinfo
aries/branches/subsystemsR6/jndi/jndi-core/pom.xml
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextManagerService.java
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiInitialContextFactoryBuilder.java
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ObjectFactoryHelper.java
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/Utils.java
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/startup/Activator.java
aries/branches/subsystemsR6/jndi/jndi-url-itest/pom.xml
aries/branches/subsystemsR6/jndi/jndi-url/pom.xml
aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/AbstractServiceRegistryContext.java
aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContextFactory.java
aries/branches/subsystemsR6/jpa/jpa-api/pom.xml
aries/branches/subsystemsR6/jpa/jpa-blueprint-aries/pom.xml
aries/branches/subsystemsR6/jpa/jpa-blueprint-aries/src/main/java/org/apache/aries/jpa/blueprint/aries/impl/NSHandler.java
aries/branches/subsystemsR6/jpa/jpa-blueprint-aries/src/main/resources/org/apache/aries/jpa/blueprint/aries/nls/ariesBlueprintJpaMessages.properties
aries/branches/subsystemsR6/jpa/jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java
aries/branches/subsystemsR6/jpa/jpa-blueprint-testbundle/pom.xml
aries/branches/subsystemsR6/jpa/jpa-container-advancedtestbundle/pom.xml
aries/branches/subsystemsR6/jpa/jpa-container-advancedtestbundle/src/main/resources/META-INF/persistence.xml
aries/branches/subsystemsR6/jpa/jpa-container-context/pom.xml
aries/branches/subsystemsR6/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/ManagedPersistenceContextFactory.java
aries/branches/subsystemsR6/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/PersistenceContextManager.java
aries/branches/subsystemsR6/jpa/jpa-container-context/src/main/resources/org/apache/aries/jpa/container/context/nls/jpaContainerContextMessages.properties
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-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/EclipseLinkProviderService.java
aries/branches/subsystemsR6/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/platform/OSGiTSServer.java
aries/branches/subsystemsR6/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/platform/OSGiTSWrapper.java
aries/branches/subsystemsR6/jpa/jpa-container-itest/pom.xml
aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/EclipseLinkWeavingAndAnnotationScanningTest.java
aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/OpenjpaWeavingAndAnnotationScanningTest.java
aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java
aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java
aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkContextTest.java
aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java
aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java
aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/OpenjpaContextTest.java
aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/QuiesceJPATest.java
aries/branches/subsystemsR6/jpa/jpa-container-testbundle-eclipselink/pom.xml
aries/branches/subsystemsR6/jpa/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/persistence.xml
aries/branches/subsystemsR6/jpa/jpa-container-testbundle/pom.xml
aries/branches/subsystemsR6/jpa/jpa-container-testbundle/src/main/resources/META-INF/persistence.xml
aries/branches/subsystemsR6/jpa/jpa-container/pom.xml
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/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/parsing/impl/JPAHandler.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parsing/impl/PersistenceUnitImpl.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parsing/impl/SchemaLocatingHandler.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/OSGiTransactionManager.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/XADatasourceEnlistingWrapper.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/ManagedPersistenceUnitInfoFactoryImpl.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/ManagedPersistenceUnitInfoImpl.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java
aries/branches/subsystemsR6/jpa/jpa-container/src/main/resources/org/apache/aries/jpa/container/nls/jpaContainerMessages.properties
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/PersistenceXMLParsingTest.java
aries/branches/subsystemsR6/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/weaving/JPAWeavingHookTest.java
aries/branches/subsystemsR6/jpa/jpa-container/src/test/java/org/apache/aries/util/AriesFrameworkUtil.java
aries/branches/subsystemsR6/jpa/pom.xml
aries/branches/subsystemsR6/pom.xml
aries/branches/subsystemsR6/proxy/proxy-bundle/pom.xml
aries/branches/subsystemsR6/proxy/proxy-impl/pom.xml
aries/branches/subsystemsR6/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/AsmProxyManager.java
aries/branches/subsystemsR6/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java
aries/branches/subsystemsR6/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyAdapter.java
aries/branches/subsystemsR6/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java
aries/branches/subsystemsR6/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/ConstructorFinder.java
aries/branches/subsystemsR6/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/MethodCopyingClassAdapter.java
aries/branches/subsystemsR6/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/OSGiFriendlyClassVisitor.java
aries/branches/subsystemsR6/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassAdapter.java
aries/branches/subsystemsR6/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassHierarchyAdapter.java
aries/branches/subsystemsR6/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceCombiningClassAdapter.java
aries/branches/subsystemsR6/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceProxyGenerator.java
aries/branches/subsystemsR6/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/SyntheticSerialVerUIDAdder.java
aries/branches/subsystemsR6/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/synthesizer/Synthesizer.java
aries/branches/subsystemsR6/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/InterfaceProxyingTest.java
aries/branches/subsystemsR6/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/WovenProxyGeneratorTest.java
aries/branches/subsystemsR6/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/WovenProxyPlusSubclassGeneratorTest.java
aries/branches/subsystemsR6/proxy/proxy-itests/pom.xml
aries/branches/subsystemsR6/subsystem/subsystem-api/pom.xml
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/archive/Grammar.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/SubsystemExportServiceHeader.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/SubsystemImportServiceHeader.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Activator.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Location.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/OsgiIdentityCapability.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResourceInstaller.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResourceUninstaller.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/StartAction.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/StopAction.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResourceInstaller.java
aries/branches/subsystemsR6/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/LocationTest.java
aries/branches/subsystemsR6/subsystem/subsystem-itests/pom.xml
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BasicTest.java
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BlueprintTest.java
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/DynamicImportTest.java
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java
aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/resources/composite2/OSGI-INF/SUBSYSTEM.MF
aries/branches/subsystemsR6/subsystem/subsystem-obr/pom.xml
aries/branches/subsystemsR6/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/obr/internal/RepositoryAdminRepository.java
aries/branches/subsystemsR6/subsystem/subsystem-obr/src/test/java/org/apache/aries/subsystem/obr/internal/FelixCapabilityAdapterTest.java
aries/branches/subsystemsR6/subsystem/subsystem-obr/src/test/java/org/apache/aries/subsystem/obr/internal/FelixRequirementAdapterTest.java
aries/branches/subsystemsR6/subsystem/subsystem-obr/src/test/java/org/apache/aries/subsystem/obr/internal/OsgiRequirementAdapterTest.java
aries/branches/subsystemsR6/transaction/transaction-blueprint/pom.xml
aries/branches/subsystemsR6/transaction/transaction-itests/pom.xml
aries/branches/subsystemsR6/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
aries/branches/subsystemsR6/transaction/transaction-jdbc/pom.xml
aries/branches/subsystemsR6/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/RecoverableDataSource.java
aries/branches/subsystemsR6/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/Activator.java
aries/branches/subsystemsR6/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ConnectionManagerFactory.java
aries/branches/subsystemsR6/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ManagedDataSourceFactory.java
aries/branches/subsystemsR6/transaction/transaction-jms/pom.xml
aries/branches/subsystemsR6/transaction/transaction-manager/pom.xml
aries/branches/subsystemsR6/versioning/pom.xml
aries/branches/subsystemsR6/web/web-itests/pom.xml
aries/branches/subsystemsR6/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java
aries/branches/subsystemsR6/web/web-urlhandler/pom.xml
aries/branches/subsystemsR6/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/CaseInsensitiveMap.java
aries/branches/subsystemsR6/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/PackageFinder.java
aries/branches/subsystemsR6/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java
aries/branches/subsystemsR6/web/web-urlhandler/src/main/java/org/apache/aries/web/url/WAR_URLServiceHandler.java
aries/branches/subsystemsR6/web/web-urlhandler/src/test/java/org/apache/aries/web/converter/impl/WabConverterTest.java
Propchange: aries/branches/subsystemsR6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 7 19:37:42 2015
@@ -1,2 +1,2 @@
/aries/branches/1.0-prototype:1306564-1337594
-/aries/trunk:1535830-1618991
+/aries/trunk:1535830-1649881
Propchange: aries/branches/subsystemsR6/blueprint/blueprint-authz/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jan 7 19:37:42 2015
@@ -0,0 +1 @@
+target
Modified: aries/branches/subsystemsR6/blueprint/blueprint-authz/pom.xml
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-authz/pom.xml?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-authz/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-authz/pom.xml Wed Jan 7
19:37:42 2015
@@ -25,13 +25,14 @@
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
<version>2.0.0</version>
+ <relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.authz</artifactId>
<packaging>bundle</packaging>
- <version>1.0.0-SNAPSHOT</version>
- <name>Aries :: blueprint :: annotation based authorization</name>
+ <version>1.0.1-SNAPSHOT</version>
+ <name>Apache Aries Blueprint Annotation based authorization</name>
<properties>
<!-- Export package versions are maintained in packageinfo files -->
@@ -44,6 +45,12 @@
<aries.skip.version.check>true</aries.skip.version.check>
</properties>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-authz</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-authz</developerConnection>
+
<url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-authz</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
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=1650143&r1=1650142&r2=1650143&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
Wed Jan 7 19:37:42 2015
@@ -38,10 +38,10 @@ public class AuthorizationNsHandler impl
ComponentDefinitionRegistry cdr = pc.getComponentDefinitionRegistry();
if ("enable".equals(elt.getLocalName())) {
- if
(!cdr.containsComponentDefinition(AnnotationParser.ANNOTATION_PARSER_BEAN_NAME))
{
+ if
(!cdr.containsComponentDefinition(AuthorizationBeanProcessor.AUTH_PROCESSOR_BEAN_NAME))
{
MutableBeanMetadata meta =
pc.createMetadata(MutableBeanMetadata.class);
- meta.setId(AnnotationParser.ANNOTATION_PARSER_BEAN_NAME);
- meta.setRuntimeClass(AnnotationParser.class);
+
meta.setId(AuthorizationBeanProcessor.AUTH_PROCESSOR_BEAN_NAME);
+ meta.setRuntimeClass(AuthorizationBeanProcessor.class);
meta.setProcessor(true);
MutablePassThroughMetadata cdrMeta =
pc.createMetadata(MutablePassThroughMetadata.class);
cdrMeta.setObject(cdr);
Modified:
aries/branches/subsystemsR6/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/SecurityAnotationParser.java
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/SecurityAnotationParser.java?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
---
aries/branches/subsystemsR6/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/SecurityAnotationParser.java
(original)
+++
aries/branches/subsystemsR6/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/SecurityAnotationParser.java
Wed Jan 7 19:37:42 2015
@@ -60,4 +60,30 @@ class SecurityAnotationParser {
return ann;
}
+ /**
+ * A class is secured if either the class or one of its methods is secured.
+ * An AnnotatedElement is secured if @RolesAllowed or @DenyAll is present.
+ *
+ * @param clazz
+ * @return
+ */
+ public boolean isSecured(Class<?> clazz) {
+ if (clazz == Object.class) {
+ return false;
+ }
+ if (isSecuredEl(clazz)) {
+ return true;
+ }
+ for (Method m : clazz.getMethods()) {
+ if (isSecuredEl(m)) {
+ return true;
+ }
+
+ }
+ return false;
+ }
+
+ private boolean isSecuredEl(AnnotatedElement element) {
+ return element.isAnnotationPresent(RolesAllowed.class) ||
element.isAnnotationPresent(DenyAll.class);
+ }
}
Modified:
aries/branches/subsystemsR6/blueprint/blueprint-authz/src/test/java/org/apache/aries/blueprint/authorization/impl/SecurityAnnoationParserTest.java
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-authz/src/test/java/org/apache/aries/blueprint/authorization/impl/SecurityAnnoationParserTest.java?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
---
aries/branches/subsystemsR6/blueprint/blueprint-authz/src/test/java/org/apache/aries/blueprint/authorization/impl/SecurityAnnoationParserTest.java
(original)
+++
aries/branches/subsystemsR6/blueprint/blueprint-authz/src/test/java/org/apache/aries/blueprint/authorization/impl/SecurityAnnoationParserTest.java
Wed Jan 7 19:37:42 2015
@@ -35,6 +35,13 @@ public class SecurityAnnoationParserTest
public SecurityAnnoationParserTest() {
annParser = new SecurityAnotationParser();
}
+
+ @Test
+ public void testIsSecured() {
+ Assert.assertTrue(annParser.isSecured(SecuredClass.class));
+ Assert.assertFalse(annParser.isSecured(Object.class));
+ Assert.assertFalse(annParser.isSecured(Activator.class));
+ }
@Test
public void testAnnotationType() throws NoSuchMethodException,
SecurityException {
@@ -59,4 +66,5 @@ public class SecurityAnnoationParserTest
Assert.assertTrue(ann instanceof RolesAllowed);
return ((RolesAllowed)ann).value();
}
+
}
Modified: aries/branches/subsystemsR6/blueprint/blueprint-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-bundle/pom.xml?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-bundle/pom.xml Wed Jan 7
19:37:42 2015
@@ -122,13 +122,13 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.0.6-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/branches/subsystemsR6/blueprint/blueprint-cm/pom.xml
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-cm/pom.xml?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-cm/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-cm/pom.xml Wed Jan 7
19:37:42 2015
@@ -31,7 +31,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
<packaging>bundle</packaging>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.0.6-SNAPSHOT</version>
<name>Apache Aries Blueprint CM</name>
<description>
This bundle contains the ConfigAdmin namespace for blueprint.
@@ -58,7 +58,7 @@
<blueprint.api.version>1.0.0</blueprint.api.version>
<blueprint.core.version>1.2.0</blueprint.core.version>
<blueprint.parser.version>1.1.0</blueprint.parser.version>
- <lastReleaseVersion>1.0.3</lastReleaseVersion>
+ <lastReleaseVersion>1.0.4</lastReleaseVersion>
</properties>
<profiles>
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=1650143&r1=1650142&r2=1650143&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
Wed Jan 7 19:37:42 2015
@@ -152,6 +152,9 @@ public class CmManagedProperties impleme
LOGGER.debug("Configuration updated for bean={} / pid={}", beanName,
persistentId);
synchronized (lock) {
properties = props;
+ for (Object bean : beans) {
+ updated(bean, properties);
+ }
}
}
Modified: aries/branches/subsystemsR6/blueprint/blueprint-core/pom.xml
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-core/pom.xml?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-core/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-core/pom.xml Wed Jan 7
19:37:42 2015
@@ -32,7 +32,7 @@
<artifactId>org.apache.aries.blueprint.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Blueprint Core</name>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
<description>
This bundle contains the core implementation of Blueprint
along with the "ext" namespace handler.
@@ -91,7 +91,7 @@
</aries.osgi.include.resource>
<blueprint.annotation.api.version>1.0.0</blueprint.annotation.api.version>
<blueprint.api.version>1.0.0</blueprint.api.version>
- <blueprint.parser.version>1.3.0-SNAPSHOT</blueprint.parser.version>
+ <blueprint.parser.version>1.3.0</blueprint.parser.version>
<proxy.api.version>1.0.0</proxy.api.version>
<proxy.impl.version>1.0.3</proxy.impl.version>
<quiesce.api.version>1.0.0</quiesce.api.version>
@@ -104,7 +104,7 @@
<id>dev</id>
<properties>
<blueprint.annotation.api.version>1.0.1-SNAPSHOT</blueprint.annotation.api.version>
- <blueprint.api.version>1.0.1-SNAPSHOT</blueprint.api.version>
+ <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version>
<blueprint.parser.version>1.2.1-SNAPSHOT</blueprint.parser.version>
<proxy.api.version>1.0.0</proxy.api.version>
<proxy.impl.version>1.0.0</proxy.impl.version>
Modified:
aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
---
aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
(original)
+++
aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
Wed Jan 7 19:37:42 2015
@@ -374,8 +374,9 @@ public class BlueprintContainerImpl
break;
case Create:
cancelFutureIfPresent();
- registerServices();
instantiateEagerComponents();
+ //Register the services after the eager components are
ready, as per 121.6
+ registerServices();
// Register the BlueprintContainer in the OSGi registry
int bs = bundle.getState();
if (registration == null && (bs == Bundle.ACTIVE || bs
== Bundle.STARTING)) {
Modified:
aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
---
aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
(original)
+++
aries/branches/subsystemsR6/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
Wed Jan 7 19:37:42 2015
@@ -288,9 +288,19 @@ public class ServiceRecipe extends Abstr
validateClasses(o);
} else if (o instanceof UnwrapperedBeanHolder) {
UnwrapperedBeanHolder holder = (UnwrapperedBeanHolder)
o;
- validateClasses(holder.unwrapperedBean);
- o = BeanRecipe.wrap(holder,
getClassesForProxying(holder.unwrapperedBean));
- } else {
+ if (holder.unwrapperedBean instanceof ServiceFactory) {
+ //If a service factory is used, make sure the
proxy classes implement this
+ //interface so that later on, internalGetService
will create the real
+ //service from it.
+ LOGGER.debug("{} implements ServiceFactory,
creating proxy that also implements this", holder.unwrapperedBean);
+ Collection<Class<?>> cls =
getClassesForProxying(holder.unwrapperedBean);
+
cls.add(blueprintContainer.loadClass("org.osgi.framework.ServiceFactory"));
+ o = BeanRecipe.wrap(holder, cls);
+ } else {
+ validateClasses(holder.unwrapperedBean);
+ o = BeanRecipe.wrap(holder,
getClassesForProxying(holder.unwrapperedBean));
+ }
+ } else if (!(o instanceof ServiceFactory)) {
validateClasses(o);
}
service = o;
Modified: aries/branches/subsystemsR6/blueprint/blueprint-itests/pom.xml
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-itests/pom.xml?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-itests/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-itests/pom.xml Wed Jan 7
19:37:42 2015
@@ -62,17 +62,17 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-parser</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.authz</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.0.6-SNAPSHOT</version>
<type>bundle</type>
<scope>compile</scope>
<exclusions>
Modified:
aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceIgnoreUnknownNamespaceHandlerTest.java
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceIgnoreUnknownNamespaceHandlerTest.java?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
---
aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceIgnoreUnknownNamespaceHandlerTest.java
(original)
+++
aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceIgnoreUnknownNamespaceHandlerTest.java
Wed Jan 7 19:37:42 2015
@@ -18,21 +18,21 @@
*/
package org.apache.aries.blueprint.itests;
+import static org.apache.aries.blueprint.itests.Helper.blueprintBundles;
+import static org.ops4j.pax.exam.CoreOptions.frameworkProperty;
+import static org.ops4j.pax.exam.CoreOptions.keepCaches;
+import static org.ops4j.pax.exam.CoreOptions.streamBundle;
+
import java.io.InputStream;
import java.net.URL;
-import javax.inject.Inject;
-
import org.apache.aries.blueprint.itests.cm.service.Foo;
import org.apache.aries.blueprint.itests.cm.service.FooFactory;
import org.apache.aries.blueprint.itests.cm.service.FooInterface;
import org.apache.aries.blueprint.services.ParserService;
import org.junit.After;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.TestName;
-import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.ProbeBuilder;
import org.ops4j.pax.exam.TestProbeBuilder;
@@ -42,46 +42,49 @@ import org.osgi.framework.Constants;
public class ParserServiceIgnoreUnknownNamespaceHandlerTest extends
AbstractBlueprintIntegrationTest {
- private static final String CM_BUNDLE = "org.apache.aries.blueprint.cm";
- private static final String TEST_BUNDLE =
"org.apache.aries.blueprint.cm.test.b1";
-
- @ProbeBuilder
- public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) {
- probe.setHeader(Constants.EXPORT_PACKAGE,
Foo.class.getPackage().getName());
- probe.setHeader(Constants.IMPORT_PACKAGE,
Foo.class.getPackage().getName());
- return probe;
- }
+ private static final String CM_BUNDLE = "org.apache.aries.blueprint.cm";
+ private static final String TEST_BUNDLE =
"org.apache.aries.blueprint.cm.test.b1";
+
+ @ProbeBuilder
+ public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) {
+ probe.setHeader(Constants.EXPORT_PACKAGE,
Foo.class.getPackage().getName());
+ probe.setHeader(Constants.IMPORT_PACKAGE,
Foo.class.getPackage().getName());
+ return probe;
+ }
@org.ops4j.pax.exam.Configuration
public Option[] config() {
- InputStream testBundle = TinyBundles.bundle()
+ InputStream testBundle = createTestBundle();
+ return new Option[] {
+ baseOptions(),
+
frameworkProperty("org.apache.aries.blueprint.parser.service.ignore.unknown.namespace.handlers").value("true"),
+ blueprintBundles(),
+ keepCaches(),
+ streamBundle(testBundle)
+ };
+ }
+
+ private InputStream createTestBundle() {
+ return TinyBundles.bundle()
.add(FooInterface.class)
.add(Foo.class)
.add(FooFactory.class)
- .add("OSGI-INF/blueprint/context.xml",
- getResource("ManagedServiceFactoryTest.xml"))
+ .add("OSGI-INF/blueprint/context.xml",
getResource("IgnoreUnknownNamespaceTest.xml"))
.set(Constants.BUNDLE_SYMBOLICNAME, TEST_BUNDLE)
.set(Constants.EXPORT_PACKAGE, Foo.class.getPackage().getName())
.set(Constants.IMPORT_PACKAGE, Foo.class.getPackage().getName())
.build(TinyBundles.withBnd());
- return new Option[] {
- baseOptions(),
-
CoreOptions.frameworkProperty("org.apache.aries.blueprint.parser.service.ignore.unknown.namespace.handlers").value("true"),
- Helper.blueprintBundles(),
- CoreOptions.keepCaches(),
- CoreOptions.streamBundle(testBundle)
- };
}
- @Before
- public void stopCM() throws BundleException {
- context().getBundleByName(CM_BUNDLE).stop();
- }
-
- @After
- public void startCM() throws BundleException {
- context().getBundleByName(CM_BUNDLE).start();
- }
+ @Before
+ public void stopCM() throws BundleException {
+ context().getBundleByName(CM_BUNDLE).stop();
+ }
+
+ @After
+ public void startCM() throws BundleException {
+ context().getBundleByName(CM_BUNDLE).start();
+ }
@Test
public void testIgnoreTrue() throws Exception {
Modified:
aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/ManagedServiceFactoryUseSystemBundleTest.java
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/ManagedServiceFactoryUseSystemBundleTest.java?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
---
aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/ManagedServiceFactoryUseSystemBundleTest.java
(original)
+++
aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/ManagedServiceFactoryUseSystemBundleTest.java
Wed Jan 7 19:37:42 2015
@@ -56,6 +56,7 @@ import org.osgi.framework.hooks.service.
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
+@SuppressWarnings({"rawtypes", "unchecked"})
public class ManagedServiceFactoryUseSystemBundleTest extends
AbstractBlueprintIntegrationTest {
private static final String CM_BUNDLE = "org.apache.aries.blueprint.cm";
private static final String TEST_BUNDLE =
"org.apache.aries.blueprint.cm.test.b1";
@@ -145,7 +146,6 @@ public class ManagedServiceFactoryUseSys
props.put("a", "5");
cf.update(props);
- @SuppressWarnings("rawtypes")
ServiceReference sr = getServiceRef(Foo.class, "(key=foo1)");
Foo foo = (Foo)context().getService(sr);
assertNotNull(foo);
@@ -176,7 +176,6 @@ public class ManagedServiceFactoryUseSys
props.put("a", "5");
cf.update(props);
- @SuppressWarnings("rawtypes")
ServiceReference sr = getServiceRef(Foo.class, "(key=foo2)");
Foo foo = (Foo)context().getService(sr);
assertNotNull(foo);
@@ -209,7 +208,6 @@ public class ManagedServiceFactoryUseSys
props.put("a", "5");
cf.update(props);
- @SuppressWarnings("rawtypes")
ServiceReference sr = getServiceRef(Foo.class,
"(&(key=foo3)(a=5))");
assertNotNull(sr);
Foo foo = (Foo) context().getService(sr);
@@ -235,7 +233,6 @@ public class ManagedServiceFactoryUseSys
cf.delete();
}
- @SuppressWarnings("rawtypes")
@Test
public void testCreateAndUpdate() throws Exception {
Configuration cf =
ca.createFactoryConfiguration("blueprint-sample-managed-service-factory3",
null);
@@ -295,8 +292,7 @@ public class ManagedServiceFactoryUseSys
cf2.delete();
}
- @SuppressWarnings("rawtypes")
-@Test
+ @Test
public void testCreateAndUpdateUsingUpdateMethod() throws Exception {
Configuration cf =
ca.createFactoryConfiguration("blueprint-sample-managed-service-factory4",
null);
Hashtable<String, String> props = new Hashtable<String, String>();
@@ -360,7 +356,6 @@ public class ManagedServiceFactoryUseSys
props.put("a", "5");
cf.update(props);
- @SuppressWarnings("rawtypes")
ServiceReference sr = getServiceRef(Foo.class, "(key=foo5)");
Foo foo = (Foo) context().getService(sr);
assertNotNull(foo);
@@ -384,7 +379,6 @@ public class ManagedServiceFactoryUseSys
assertNull(sr.getProperty("b"));
}
- @SuppressWarnings("rawtypes")
private ServiceReference getServiceRef(Class serviceInterface, String
filter) throws InvalidSyntaxException {
int tries = 0;
do {
Propchange: aries/branches/subsystemsR6/blueprint/blueprint-noosgi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jan 7 19:37:42 2015
@@ -5,3 +5,4 @@ target
.project
velocity.log
.externalToolBuilders
+dependency-reduced-pom.xml
Modified: aries/branches/subsystemsR6/blueprint/blueprint-parser/pom.xml
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-parser/pom.xml?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-parser/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-parser/pom.xml Wed Jan 7
19:37:42 2015
@@ -32,7 +32,7 @@
<artifactId>blueprint-parser</artifactId>
<packaging>jar</packaging>
<name>Apache Aries Blueprint Parser</name>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<description>
This bundle contains the blueprint parser in a plain jar.
</description>
Modified: aries/branches/subsystemsR6/blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/pom.xml?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/pom.xml Wed Jan 7 19:37:42 2015
@@ -45,6 +45,7 @@
<module>blueprint-bundle</module>
<module>blueprint-compatibility</module>
<module>blueprint-core-compatibility</module>
+ <module>blueprint-maven-plugin</module>
<module>blueprint-noosgi</module>
<module>blueprint-web</module>
<module>blueprint-web-osgi</module>
Modified: aries/branches/subsystemsR6/esa-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/esa-maven-plugin/pom.xml?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
--- aries/branches/subsystemsR6/esa-maven-plugin/pom.xml (original)
+++ aries/branches/subsystemsR6/esa-maven-plugin/pom.xml Wed Jan 7 19:37:42
2015
@@ -29,7 +29,7 @@
</parent>
<artifactId>esa-maven-plugin</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Aries Maven ESA Plugin</name>
<description>Builds an esa (Enterprise Subsystem Archive) from the project
for deployment to an aries server.
Modified:
aries/branches/subsystemsR6/esa-maven-plugin/src/main/java/org/apache/aries/plugin/esa/ContentInfo.java
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/esa-maven-plugin/src/main/java/org/apache/aries/plugin/esa/ContentInfo.java?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
---
aries/branches/subsystemsR6/esa-maven-plugin/src/main/java/org/apache/aries/plugin/esa/ContentInfo.java
(original)
+++
aries/branches/subsystemsR6/esa-maven-plugin/src/main/java/org/apache/aries/plugin/esa/ContentInfo.java
Wed Jan 7 19:37:42 2015
@@ -27,47 +27,53 @@ import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import aQute.lib.osgi.Analyzer;
+
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
import org.apache.maven.shared.osgi.Maven2OsgiConverter;
-import aQute.lib.osgi.Analyzer;
-
public class ContentInfo {
-
+
/**
* Coverter for maven pom values to OSGi manifest values (pulled in from
the maven-bundle-plugin)
*/
private static Maven2OsgiConverter maven2OsgiConverter = new
DefaultMaven2OsgiConverter();
-
+
private String symbolicName;
private String type;
private String version;
-
+ private VersionRange mavenVersionRange;
+
public String getSymbolicName() {
return symbolicName;
}
-
+
public String getType() {
return type;
}
-
+
public String getVersion() {
return version;
}
-
+
public String getContentLine() {
String line = symbolicName;
if (type != null) {
line += ";type=\"" + type + "\"";
}
- if (version != null) {
- line += ";version=\"" + version + "\"";
+ if (mavenVersionRange != null && mavenVersionRange.hasRestrictions()) {
+ line += ";version=\"" + mavenVersionRange + '"';
+ } else {
+ if (version != null) {
+ line += ";version=\"[" + version + "," + version + "]\"";
+ }
}
return line;
}
-
+
public static ContentInfo create(Artifact artifact, Log log) {
ZipFile zip = null;
try {
@@ -100,64 +106,67 @@ public class ContentInfo {
private static ContentInfo handleUnknown(Artifact artifact) {
ContentInfo info = new ContentInfo();
info.symbolicName =
maven2OsgiConverter.getBundleSymbolicName(artifact);
- info.version = Analyzer.cleanupVersion(artifact.getVersion());
+ info.version = Analyzer.cleanupVersion(artifact.getVersion());
+ info.mavenVersionRange = artifact.getVersionRange();
return info;
}
private static ContentInfo handleSubsystem(Artifact artifact, Manifest mf)
{
ContentInfo info = new ContentInfo();
-
+
Attributes mainAttributes = mf.getMainAttributes();
-
+
String subsystemSymbolicName =
mainAttributes.getValue(Constants.SUBSYSTEM_SYMBOLICNAME);
if (subsystemSymbolicName != null) {
Map<String, ?> header =
Analyzer.parseHeader(subsystemSymbolicName, null);
- info.symbolicName = (String) header.keySet().iterator().next();
+ info.symbolicName = header.keySet().iterator().next();
}
-
+
String subsystemVersion =
mainAttributes.getValue(Constants.SUBSYSTEM_VERSION);
if (subsystemVersion != null) {
info.version = subsystemVersion;
}
-
+
String subsystemType =
mainAttributes.getValue(Constants.SUBSYSTEM_TYPE);
if (subsystemType == null) {
info.type = Constants.APPLICATION_TYPE;
} else {
Map<String, ?> header = Analyzer.parseHeader(subsystemType, null);
- info.type = (String) header.keySet().iterator().next();
+ info.type = header.keySet().iterator().next();
}
-
+
+ info.mavenVersionRange = artifact.getVersionRange();
return info;
}
private static ContentInfo handleManifest(Artifact artifact, Manifest mf) {
Attributes mainAttributes = mf.getMainAttributes();
-
+
String bundleSymbolicName =
mainAttributes.getValue(Constants.BUNDLE_SYMBOLICNAME);
if (bundleSymbolicName == null) {
// not a bundle
return handleUnknown(artifact);
} else {
ContentInfo info = new ContentInfo();
-
+
Map<String, ?> header = Analyzer.parseHeader(bundleSymbolicName,
null);
- info.symbolicName = (String) header.keySet().iterator().next();
-
+ info.symbolicName = header.keySet().iterator().next();
+
String bundleVersion =
mainAttributes.getValue(Constants.BUNDLE_VERSION);
if (bundleVersion != null) {
info.version = bundleVersion;
}
-
+
if (mainAttributes.getValue(Constants.FRAGMENT_HOST) != null) {
info.type = Constants.FRAGMENT_TYPE;
}
-
+
+ info.mavenVersionRange = artifact.getVersionRange();
return info;
}
}
-
- private static Manifest getManifest(ZipFile zip, ZipEntry entry) throws
IOException {
+
+ private static Manifest getManifest(ZipFile zip, ZipEntry entry) throws
IOException {
InputStream in = null;
try {
in = zip.getInputStream(entry);
Modified:
aries/branches/subsystemsR6/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/EsaMojoTest.java
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/EsaMojoTest.java?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
---
aries/branches/subsystemsR6/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/EsaMojoTest.java
(original)
+++
aries/branches/subsystemsR6/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/EsaMojoTest.java
Wed Jan 7 19:37:42 2015
@@ -26,17 +26,15 @@ import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
-import java.util.Iterator;
import java.util.Map;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
+import aQute.lib.osgi.Analyzer;
+
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.codehaus.plexus.archiver.zip.ZipEntry;
import org.codehaus.plexus.archiver.zip.ZipFile;
-import org.codehaus.plexus.util.FileUtils;
-
-import aQute.lib.osgi.Analyzer;
/**
* @author <a href="mailto:[email protected]";>Allan Ramirez</a>
@@ -60,13 +58,13 @@ public class EsaMojoTest
{
testBasicEsa(
"target/test-classes/unit/basic-esa-test/plugin-config.xml", null );
}
-
+
public void testBasicEsaPgkType()
throws Exception
{
testBasicEsa(
"target/test-classes/unit/basic-esa-test-with-pgk-type/plugin-config.xml",
"maven-esa-test-1.0-SNAPSHOT.jar" );
}
-
+
private void testBasicEsa(String path, String extraExpectedFiles)
throws Exception
{
@@ -221,19 +219,19 @@ public class EsaMojoTest
InputStream in = esa.getInputStream(entry);
Manifest mf = new Manifest(in);
-
+
return mf;
}
-
+
private Map<String, Map<String, String>> getHeader(Manifest mf, String
header) {
Attributes attributes = mf.getMainAttributes();
String value = attributes.getValue(header);
assertNotNull("Header " + header + " not found", value);
return Analyzer.parseHeader(value, null);
}
-
+
private void testForHeader(ZipFile esa, String header, String exactEntry)
throws Exception {
-
+
Enumeration entries = esa.getEntries();
@@ -242,7 +240,7 @@ public class EsaMojoTest
BufferedReader br = new BufferedReader(new
InputStreamReader(esa.getInputStream(entry)));
Boolean foundHeader=false;
-
+
String line;
while ((line = br.readLine()) != null) {
if (line.contains(header)) {
@@ -251,7 +249,7 @@ public class EsaMojoTest
}
}
assertTrue("Found " + header + ":", foundHeader);
-
+
}
public void testSubsystemManifestGeneration()
@@ -293,7 +291,7 @@ public class EsaMojoTest
expectedFiles.add( "maven-artifact02-1.0-SNAPSHOT.jar" );
ZipFile esa = new ZipFile( esaFile );
-
+
Enumeration entries = esa.getEntries();
assertTrue( entries.hasMoreElements() );
@@ -341,7 +339,7 @@ public class EsaMojoTest
expectedFiles.add( "maven-artifact02-1.0-SNAPSHOT.jar" );
ZipFile esa = new ZipFile( esaFile );
-
+
Enumeration entries = esa.getEntries();
assertTrue( entries.hasMoreElements() );
@@ -351,19 +349,19 @@ public class EsaMojoTest
Manifest mf = getSubsystemManifest(esa);
Map<String, Map<String, String>> header = getHeader(mf,
"Subsystem-Content");
-
+
Map<String, String> attributes = null;
-
+
attributes = header.get("maven-artifact01-1.0-SNAPSHOT");
assertNotNull(attributes);
- assertEquals("1.0.0.SNAPSHOT", attributes.get("version"));
+ assertEquals("[1.0.0.SNAPSHOT,1.0.0.SNAPSHOT]",
attributes.get("version"));
// start-order is actually a directive, shows up here as the name+":"
assertEquals("1", attributes.get("start-order:"));
assertNull(attributes.get("type"));
-
+
attributes = header.get("maven-artifact02-1.0-SNAPSHOT");
assertNotNull(attributes);
- assertEquals("1.0.0.SNAPSHOT", attributes.get("version"));
+ assertEquals("[1.0.0.SNAPSHOT,1.0.0.SNAPSHOT]",
attributes.get("version"));
assertEquals("2", attributes.get("start-order:"));
assertNull(attributes.get("type"));
}
@@ -498,7 +496,7 @@ public class EsaMojoTest
expectedFiles.add( "maven-artifact02-1.0-SNAPSHOT.jar" );
ZipFile esa = new ZipFile( esaFile );
-
+
Enumeration entries = esa.getEntries();
assertTrue( entries.hasMoreElements() );
@@ -511,7 +509,7 @@ public class EsaMojoTest
// Test for the MyHeader header
testForHeader(esa, "MyHeader", "MyHeader: myValue");
-
+
// Test for the Subsystem-Name header
testForHeader(esa, "Subsystem-Name", "Subsystem-Name: myName");
}
@@ -559,30 +557,30 @@ public class EsaMojoTest
Manifest mf = getSubsystemManifest(esa);
Map<String, Map<String, String>> header = getHeader(mf,
"Subsystem-Content");
-
+
Map<String, String> attributes = null;
-
+
attributes = header.get("maven-artifact01-1.0-SNAPSHOT");
assertNotNull(attributes);
- assertEquals("1.0.0.SNAPSHOT", attributes.get("version"));
+ assertEquals("[1.0.0.SNAPSHOT,1.0.0.SNAPSHOT]",
attributes.get("version"));
assertNull(attributes.get("type"));
-
+
attributes = header.get("maven-artifact02-1.0-SNAPSHOT");
assertNotNull(attributes);
- assertEquals("1.0.0.SNAPSHOT", attributes.get("version"));
+ assertEquals("[1.3,2.5)", attributes.get("version"));
assertNull(attributes.get("type"));
-
+
attributes = header.get("maven-artifact03");
assertNotNull(attributes);
- assertEquals("1.1.0.SNAPSHOT.NNN", attributes.get("version"));
+ assertEquals("[1.1.0.SNAPSHOT.NNN,1.1.0.SNAPSHOT.NNN]",
attributes.get("version"));
assertEquals("osgi.fragment", attributes.get("type"));
-
+
attributes = header.get("maven-artifact04");
assertNotNull(attributes);
- assertEquals("1.2.0.SNAPSHOT", attributes.get("version"));
+ assertEquals("[1.2.0.SNAPSHOT,1.2.0.SNAPSHOT]",
attributes.get("version"));
assertEquals("feature", attributes.get("type"));
}
-
+
private int getSizeOfExpectedFiles( Enumeration entries, List
expectedFiles )
{
while( entries.hasMoreElements() )
Modified:
aries/branches/subsystemsR6/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/stubs/EsaArtifactStub.java
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/stubs/EsaArtifactStub.java?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
---
aries/branches/subsystemsR6/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/stubs/EsaArtifactStub.java
(original)
+++
aries/branches/subsystemsR6/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/stubs/EsaArtifactStub.java
Wed Jan 7 19:37:42 2015
@@ -21,6 +21,7 @@ package org.apache.aries.plugin.esa.stub
import java.io.File;
+import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
/**
@@ -30,17 +31,19 @@ public class EsaArtifactStub
extends ArtifactStub
{
private String groupId;
-
+
private String artifactId;
-
+
private String version;
-
+
private String scope;
-
+
private boolean optional;
-
+
private File file;
+ private VersionRange versionRange;
+
public String getArtifactId()
{
return artifactId;
@@ -105,9 +108,19 @@ public class EsaArtifactStub
{
return getGroupId() + ":" + getArtifactId() + ":" + getVersion();
}
-
+
public String getBaseVersion()
{
return getVersion();
}
+
+ @Override
+ public VersionRange getVersionRange() {
+ return versionRange;
+ }
+
+ @Override
+ public void setVersionRange(VersionRange versionRange) {
+ this.versionRange = versionRange;
+ }
}
Modified:
aries/branches/subsystemsR6/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/stubs/EsaMavenProjectStub9.java
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/stubs/EsaMavenProjectStub9.java?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
---
aries/branches/subsystemsR6/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/stubs/EsaMavenProjectStub9.java
(original)
+++
aries/branches/subsystemsR6/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/stubs/EsaMavenProjectStub9.java
Wed Jan 7 19:37:42 2015
@@ -23,6 +23,10 @@ import java.io.File;
import java.util.HashSet;
import java.util.Set;
+import org.apache.maven.artifact.Artifact;
+import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.artifact.versioning.VersionRange;
+
public class EsaMavenProjectStub9
extends EsaMavenProjectStub
{
@@ -30,15 +34,24 @@ public class EsaMavenProjectStub9
{
return new File( getBasedir(),
"src/test/resources/unit/basic-esa-content-type/plugin-config.xml" );
}
-
+
public Set getArtifacts()
- {
- Set artifacts = new HashSet();
-
- artifacts.add( createArtifact( "org.apache.maven.test",
"maven-artifact01", "1.0-SNAPSHOT", false ) );
- artifacts.add( createArtifact( "org.apache.maven.test",
"maven-artifact02", "1.0-SNAPSHOT", false ) );
- artifacts.add( createArtifact( "org.apache.maven.test",
"maven-artifact03", "1.1-SNAPSHOT", false ) );
- artifacts.add( createArtifact( "org.apache.maven.test",
"maven-artifact04", "1.2-SNAPSHOT", "esa", true ) );
- return artifacts;
+ {
+ try
+ {
+ Set artifacts = new HashSet();
+
+ artifacts.add( createArtifact( "org.apache.maven.test",
"maven-artifact01", "1.0-SNAPSHOT", false ) );
+ Artifact artifact02 = createArtifact( "org.apache.maven.test",
"maven-artifact02", "1.0-SNAPSHOT", false );
+
artifact02.setVersionRange(VersionRange.createFromVersionSpec("[1.3, 2.5)"));
+ artifacts.add( artifact02 );
+ artifacts.add( createArtifact( "org.apache.maven.test",
"maven-artifact03", "1.1-SNAPSHOT", false ) );
+ artifacts.add( createArtifact( "org.apache.maven.test",
"maven-artifact04", "1.2-SNAPSHOT", "esa", true ) );
+ return artifacts;
+ }
+ catch (InvalidVersionSpecificationException e)
+ {
+ throw new RuntimeException(e);
+ }
}
}
Propchange: aries/branches/subsystemsR6/jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 7 19:37:42 2015
@@ -1,3 +1,3 @@
/aries/branches/1.0-prototype/jndi:1306564-1337594
/aries/branches/dec-2011-jndi-release/jndi:1209408-1228277
-/aries/trunk/jndi:1535830-1609290
+/aries/trunk/jndi:1535830-1649881
Modified: aries/branches/subsystemsR6/jndi/jndi-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-api/pom.xml?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-api/pom.xml (original)
+++ aries/branches/subsystemsR6/jndi/jndi-api/pom.xml Wed Jan 7 19:37:42 2015
@@ -32,9 +32,9 @@
<artifactId>org.apache.aries.jndi.api</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JNDI API</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<description>
- This bundle contains the JNDI 1.0.0 API
+ This bundle contains the JNDI API
</description>
<scm>
Modified:
aries/branches/subsystemsR6/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/packageinfo
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/packageinfo?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
---
aries/branches/subsystemsR6/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/packageinfo
(original)
+++
aries/branches/subsystemsR6/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/packageinfo
Wed Jan 7 19:37:42 2015
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 1.0.0
+version 1.1.0
Modified: aries/branches/subsystemsR6/jndi/jndi-core/pom.xml
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-core/pom.xml?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-core/pom.xml (original)
+++ aries/branches/subsystemsR6/jndi/jndi-core/pom.xml Wed Jan 7 19:37:42 2015
@@ -32,7 +32,7 @@
<artifactId>org.apache.aries.jndi.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JNDI Core</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<description>
This bundle contains the core of JNDI support for OSGi.
</description>
@@ -61,7 +61,7 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
<scope>provided</scope>
- <version>1.0.0</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified:
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextManagerService.java
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextManagerService.java?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
---
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextManagerService.java
(original)
+++
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextManagerService.java
Wed Jan 7 19:37:42 2015
@@ -71,7 +71,6 @@ public class ContextManagerService imple
private Context getInitialContext(Map<?,?> environment) throws
NamingException {
Hashtable<?,?> env = Utils.toHashtable(environment);
- Utils.augmentEnvironment(env);
Context context = ContextHelper.getInitialContext(callerContext, env);
contexts.add(context);
return context;
Modified:
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiInitialContextFactoryBuilder.java
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiInitialContextFactoryBuilder.java?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
---
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiInitialContextFactoryBuilder.java
(original)
+++
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiInitialContextFactoryBuilder.java
Wed Jan 7 19:37:42 2015
@@ -39,13 +39,15 @@ public class OSGiInitialContextFactoryBu
public Context getInitialContext(Hashtable<?, ?> environment)
throws NamingException {
- Utils.augmentEnvironment(environment);
+ AugmenterInvokerImpl.getInstance().augmentEnvironment(environment);
BundleContext context = Utils.getBundleContext(environment,
InitialContext.class);
if (context == null) {
throw new
NoInitialContextException(Utils.MESSAGES.getMessage("cannot.find.callers.bundlecontext"));
}
+ AugmenterInvokerImpl.getInstance().unaugmentEnvironment(environment);
+
return ContextHelper.getInitialContext(context, environment);
}
-}
\ No newline at end of file
+}
Modified:
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
---
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java
(original)
+++
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java
Wed Jan 7 19:37:42 2015
@@ -49,6 +49,11 @@ public class OSGiObjectFactoryBuilder im
Name name,
Context nameCtx,
Hashtable<?, ?> environment) throws
Exception {
+
+ if (environment == null) {
+ environment = new Hashtable();
+ }
+
BundleContext callerContext = getCallerBundleContext(environment);
if (callerContext == null) {
return obj;
@@ -62,6 +67,11 @@ public class OSGiObjectFactoryBuilder im
Context nameCtx,
Hashtable<?, ?> environment,
Attributes attrs) throws Exception {
+
+ if (environment == null) {
+ environment = new Hashtable();
+ }
+
BundleContext callerContext = getCallerBundleContext(environment);
if (callerContext == null) {
return obj;
@@ -71,10 +81,12 @@ public class OSGiObjectFactoryBuilder im
}
private BundleContext getCallerBundleContext(Hashtable<?, ?> environment)
throws NamingException {
+ AugmenterInvokerImpl.getInstance().augmentEnvironment(environment);
BundleContext context = Utils.getBundleContext(environment,
NamingManager.class);
if (context == null) {
context = Utils.getBundleContext(environment,
DirectoryManager.class);
}
+ AugmenterInvokerImpl.getInstance().unaugmentEnvironment(environment);
return context;
}
}
Modified:
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ObjectFactoryHelper.java
URL:
http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ObjectFactoryHelper.java?rev=1650143&r1=1650142&r2=1650143&view=diff
==============================================================================
---
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ObjectFactoryHelper.java
(original)
+++
aries/branches/subsystemsR6/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ObjectFactoryHelper.java
Wed Jan 7 19:37:42 2015
@@ -64,7 +64,7 @@ public class ObjectFactoryHelper impleme
obj = ((Referenceable) obj).getReference();
}
- logger.log(Level.FINE, "obj = " + obj);
+ if (logger.isLoggable(Level.FINE)) logger.log(Level.FINE, "obj = " +
obj);
Object result = obj;
@@ -82,14 +82,14 @@ public class ObjectFactoryHelper impleme
}
}
- logger.log(Level.FINE, "Step 4: result = " + result);
+ if (logger.isLoggable(Level.FINE)) logger.log(Level.FINE, "Step
4: result = " + result);
// Step 5 - if we still don't have a resolved object goto the object
factory builds in the SR.
if (result == null || result == obj) {
result = getObjectInstanceUsingObjectFactoryBuilders(obj, name,
nameCtx, environment);
}
- logger.log(Level.FINE, "Step 5: result = " + result);
+ if (logger.isLoggable(Level.FINE)) logger.log(Level.FINE, "Step
5: result = " + result);
// Step 6 - Attempt to use all the registered ObjectFactories in the
SR.
if (result == null || result == obj) {
@@ -99,7 +99,7 @@ public class ObjectFactoryHelper impleme
}
}
- logger.log(Level.FINE, "Step 6: result = " + result);
+ if (logger.isLoggable(Level.FINE)) logger.log(Level.FINE, "Step
6: result = " + result);
// Extra, non-standard, bonus step 7. If
javax.naming.OBJECT_FACTORIES is set as
// a property in the environment, use its value to construct
additional object factories.
@@ -109,7 +109,7 @@ public class ObjectFactoryHelper impleme
result =
getObjectInstanceViaContextDotObjectFactories(obj, name, nameCtx, environment);
}
- logger.log(Level.FINE, "Step 7: result = " + result);
+ if (logger.isLoggable(Level.FINE)) logger.log(Level.FINE, "Step
7: result = " + result);
return (result == null) ? obj : result;
}
@@ -150,27 +150,27 @@ public class ObjectFactoryHelper impleme
Class<ObjectFactory> clz =
(Class<ObjectFactory>) cl.loadClass(cand);
factory = clz.newInstance();
} catch (Exception e) {
- logger.log(Level.FINE, "Exception
instantiating factory: " + e);
+ if (logger.isLoggable(Level.FINE))
logger.log(Level.FINE, "Exception instantiating factory: " + e);
continue;
}
- logger.log(Level.FINE, "cand=" + cand + "
factory=" + factory);
+ if (logger.isLoggable(Level.FINE))
logger.log(Level.FINE, "cand=" + cand + " factory=" + factory);
if (factory != null) {
if(factory instanceof DirObjectFactory)
{
- logger.log(Level.FINE, "its a
DirObjectFactory");
+ if
(logger.isLoggable(Level.FINE)) logger.log(Level.FINE, "its a
DirObjectFactory");
final DirObjectFactory
dirFactory = (DirObjectFactory) factory;
result =
dirFactory.getObjectInstance(obj, name, nameCtx, environment, attrs);
}
else
{
- logger.log(Level.FINE, "its an
ObjectFactory");
+ if
(logger.isLoggable(Level.FINE)) logger.log(Level.FINE, "its an ObjectFactory");
result =
factory.getObjectInstance(obj, name, nameCtx, environment);
}
}
if (result != null && result != obj) break;
}
}
- logger.log(Level.FINE, "result = " + result);
+ if (logger.isLoggable(Level.FINE)) logger.log(Level.FINE,
"result = " + result);
return (result == null) ? obj : result;
}
