svn commit: r1830357 [1/2] - in /aries/trunk/component-dsl: component-dsl/ component-dsl/src/main/java/org/apache/aries/component/ component-dsl/src/main/java/org/apache/aries/component/dsl/ component-dsl/src/main/java/org/apache/aries/component/dsl/fu...

Fri, 27 Apr 2018 07:20:46 -0700 

Author: csierra
Date: Fri Apr 27 14:20:33 2018
New Revision: 1830357

URL: http://svn.apache.org/viewvc?rev=1830357&view=rev
Log:
[Component-DSL] match packages with bundle name

Added:
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/CachingServiceReference.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/CachingServiceReference.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Effect.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Effect.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGi.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGiFactory.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiFactory.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGiResult.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiResult.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGiRunnable.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiRunnable.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Publisher.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Publisher.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Refresher.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Refresher.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Transformer.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Transformer.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Utils.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Utils.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function1.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function1.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function10.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function10.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function11.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function11.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function12.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function12.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function13.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function13.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function14.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function14.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function15.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function15.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function16.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function16.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function17.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function17.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function18.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function18.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function19.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function19.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function2.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function2.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function20.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function20.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function21.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function21.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function22.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function22.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function23.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function23.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function24.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function24.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function25.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function25.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function26.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function26.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function3.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function3.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function4.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function4.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function5.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function5.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function6.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function6.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function7.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function7.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function8.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function8.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function9.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function9.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/AllOSGi.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/AllOSGi.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BundleContextOSGiImpl.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/BundleContextOSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BundleOSGi.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/BundleOSGi.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ChangeContextOSGiImpl.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ChangeContextOSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConcurrentDoublyLinkedList.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConcurrentDoublyLinkedList.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConfigurationOSGiImpl.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConfigurationOSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConfigurationsOSGiImpl.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConfigurationsOSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/EffectsOSGi.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/EffectsOSGi.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/HighestRankingOSGi.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/HighestRankingOSGi.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/IgnoreImpl.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/IgnoreImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/JustOSGiImpl.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/JustOSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/NothingOSGiImpl.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/NothingOSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/OSGiImpl.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/OSGiResultImpl.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OSGiResultImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/OnCloseOSGiImpl.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OnCloseOSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/OnlyLastPublisher.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OnlyLastPublisher.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/Pad.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/Pad.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ProbeImpl.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ProbeImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ServiceReferenceOSGi.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ServiceReferenceOSGi.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ServiceRegistrationOSGiImpl.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ServiceRegistrationOSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/test/java/org/apache/aries/component/
    
aries/trunk/component-dsl/component-dsl/src/test/java/org/apache/aries/component/dsl/
    
aries/trunk/component-dsl/component-dsl/src/test/java/org/apache/aries/component/dsl/internal/
    
aries/trunk/component-dsl/component-dsl/src/test/java/org/apache/aries/component/dsl/internal/OSGiImplTest.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/component-dsl/src/test/java/org/apache/aries/osgi/functional/internal/OSGiImplTest.java
    aries/trunk/component-dsl/itests-run/generated/
    
aries/trunk/component-dsl/itests-run/generated/launch4409091442969311283.properties
    
aries/trunk/component-dsl/itests-run/generated/launch4500856088154729219.properties
    aries/trunk/component-dsl/itests-run/generated/test-reports/
    
aries/trunk/component-dsl/itests-run/generated/test-reports/TEST-org.apache.aries.component-dsl.itests-0.0.1.xml
    aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/component/
    
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/component/dsl/
    
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/component/dsl/internal/
    
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/component/dsl/internal/ProbeTests.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/osgi/functional/internal/ProbeTests.java
    
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/component/dsl/test/
    
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/component/dsl/test/AsynchronousTest.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/osgi/functional/test/AsynchronousTest.java
    
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/component/dsl/test/CachingServiceReferenceTests.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/osgi/functional/test/CachingServiceReferenceTests.java
    
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/component/dsl/test/ComponentTest.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/osgi/functional/test/ComponentTest.java
    
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/component/dsl/test/DSLTest.java
      - copied, changed from r1830338, 
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/osgi/functional/test/DSLTest.java
Removed:
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function1.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function10.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function11.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function12.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function13.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function14.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function15.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function16.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function17.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function18.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function19.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function2.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function20.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function21.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function22.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function23.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function24.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function25.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function26.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function3.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function4.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function5.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function6.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function7.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function8.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function9.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/CachingServiceReference.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Effect.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGi.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiFactory.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiResult.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiRunnable.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Publisher.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Refresher.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Transformer.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Utils.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/AllOSGi.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/BundleContextOSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/BundleOSGi.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ChangeContextOSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConcurrentDoublyLinkedList.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConfigurationOSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConfigurationsOSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/EffectsOSGi.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/HighestRankingOSGi.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/IgnoreImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/JustOSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/NothingOSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OSGiResultImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OnCloseOSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OnlyLastPublisher.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/Pad.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ProbeImpl.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ServiceReferenceOSGi.java
    
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ServiceRegistrationOSGiImpl.java
    
aries/trunk/component-dsl/component-dsl/src/test/java/org/apache/aries/osgi/functional/internal/OSGiImplTest.java
    
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/osgi/functional/internal/ProbeTests.java
    
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/osgi/functional/test/AsynchronousTest.java
    
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/osgi/functional/test/CachingServiceReferenceTests.java
    
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/osgi/functional/test/ComponentTest.java
    
aries/trunk/component-dsl/itests/src/main/java/org/apache/aries/osgi/functional/test/DSLTest.java
Modified:
    aries/trunk/component-dsl/component-dsl/bnd.bnd
    aries/trunk/component-dsl/itests/bnd.bnd

Modified: aries/trunk/component-dsl/component-dsl/bnd.bnd
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/bnd.bnd?rev=1830357&r1=1830356&r2=1830357&view=diff
==============================================================================
--- aries/trunk/component-dsl/component-dsl/bnd.bnd (original)
+++ aries/trunk/component-dsl/component-dsl/bnd.bnd Fri Apr 27 14:20:33 2018
@@ -1,3 +1,3 @@
 Export-Package:\
-       org.apache.aries.functional,\
-       org.apache.aries.osgi.functional
\ No newline at end of file
+       org.apache.aries.component.dsl,\
+       org.apache.aries.component.dsl.function
\ No newline at end of file

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/CachingServiceReference.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/CachingServiceReference.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/CachingServiceReference.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/CachingServiceReference.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/CachingServiceReference.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/CachingServiceReference.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/CachingServiceReference.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.osgi.functional;
+package org.apache.aries.component.dsl;
 
 import org.osgi.framework.ServiceReference;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Effect.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Effect.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Effect.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Effect.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Effect.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Effect.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Effect.java
 Fri Apr 27 14:20:33 2018
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.aries.osgi.functional;
+package org.apache.aries.component.dsl;
 
 import java.util.function.Consumer;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGi.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGi.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGi.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java
 Fri Apr 27 14:20:33 2018
@@ -16,50 +16,49 @@
  */
 
 
-package org.apache.aries.osgi.functional;
+package org.apache.aries.component.dsl;
 
-import org.apache.aries.functional.Function10;
-import org.apache.aries.functional.Function11;
-import org.apache.aries.functional.Function12;
-import org.apache.aries.functional.Function13;
-import org.apache.aries.functional.Function14;
-import org.apache.aries.functional.Function15;
-import org.apache.aries.functional.Function16;
-import org.apache.aries.functional.Function17;
-import org.apache.aries.functional.Function18;
-import org.apache.aries.functional.Function19;
-import org.apache.aries.functional.Function2;
-import org.apache.aries.functional.Function20;
-import org.apache.aries.functional.Function21;
-import org.apache.aries.functional.Function22;
-import org.apache.aries.functional.Function23;
-import org.apache.aries.functional.Function24;
-import org.apache.aries.functional.Function25;
-import org.apache.aries.functional.Function26;
-import org.apache.aries.functional.Function3;
-import org.apache.aries.functional.Function4;
-import org.apache.aries.functional.Function5;
-import org.apache.aries.functional.Function6;
-import org.apache.aries.functional.Function7;
-import org.apache.aries.functional.Function8;
-import org.apache.aries.functional.Function9;
-import org.apache.aries.osgi.functional.internal.BundleContextOSGiImpl;
-import org.apache.aries.osgi.functional.internal.BundleOSGi;
-import org.apache.aries.osgi.functional.internal.ChangeContextOSGiImpl;
-import org.apache.aries.osgi.functional.internal.ConcurrentDoublyLinkedList;
-import org.apache.aries.osgi.functional.internal.ConfigurationOSGiImpl;
-import org.apache.aries.osgi.functional.internal.ConfigurationsOSGiImpl;
-import org.apache.aries.osgi.functional.internal.AllOSGi;
-import org.apache.aries.osgi.functional.internal.EffectsOSGi;
-import org.apache.aries.osgi.functional.internal.IgnoreImpl;
-import org.apache.aries.osgi.functional.internal.JustOSGiImpl;
-import org.apache.aries.osgi.functional.internal.NothingOSGiImpl;
-import org.apache.aries.osgi.functional.internal.OSGiImpl;
-import org.apache.aries.osgi.functional.internal.OSGiResultImpl;
-import org.apache.aries.osgi.functional.internal.OnCloseOSGiImpl;
-import org.apache.aries.osgi.functional.internal.Pad;
-import org.apache.aries.osgi.functional.internal.ServiceReferenceOSGi;
-import org.apache.aries.osgi.functional.internal.ServiceRegistrationOSGiImpl;
+import org.apache.aries.component.dsl.function.Function10;
+import org.apache.aries.component.dsl.function.Function14;
+import org.apache.aries.component.dsl.function.Function16;
+import org.apache.aries.component.dsl.function.Function19;
+import org.apache.aries.component.dsl.function.Function2;
+import org.apache.aries.component.dsl.function.Function20;
+import org.apache.aries.component.dsl.function.Function25;
+import org.apache.aries.component.dsl.function.Function4;
+import org.apache.aries.component.dsl.function.Function6;
+import org.apache.aries.component.dsl.function.Function8;
+import org.apache.aries.component.dsl.function.Function9;
+import org.apache.aries.component.dsl.internal.ConfigurationOSGiImpl;
+import org.apache.aries.component.dsl.internal.EffectsOSGi;
+import org.apache.aries.component.dsl.internal.NothingOSGiImpl;
+import org.apache.aries.component.dsl.internal.Pad;
+import org.apache.aries.component.dsl.internal.ServiceReferenceOSGi;
+import org.apache.aries.component.dsl.internal.ServiceRegistrationOSGiImpl;
+import org.apache.aries.component.dsl.function.Function11;
+import org.apache.aries.component.dsl.function.Function12;
+import org.apache.aries.component.dsl.function.Function13;
+import org.apache.aries.component.dsl.function.Function15;
+import org.apache.aries.component.dsl.function.Function17;
+import org.apache.aries.component.dsl.function.Function18;
+import org.apache.aries.component.dsl.function.Function21;
+import org.apache.aries.component.dsl.function.Function22;
+import org.apache.aries.component.dsl.function.Function23;
+import org.apache.aries.component.dsl.function.Function24;
+import org.apache.aries.component.dsl.function.Function26;
+import org.apache.aries.component.dsl.function.Function3;
+import org.apache.aries.component.dsl.function.Function5;
+import org.apache.aries.component.dsl.function.Function7;
+import org.apache.aries.component.dsl.internal.BundleContextOSGiImpl;
+import org.apache.aries.component.dsl.internal.BundleOSGi;
+import org.apache.aries.component.dsl.internal.ChangeContextOSGiImpl;
+import org.apache.aries.component.dsl.internal.ConcurrentDoublyLinkedList;
+import org.apache.aries.component.dsl.internal.ConfigurationsOSGiImpl;
+import org.apache.aries.component.dsl.internal.AllOSGi;
+import org.apache.aries.component.dsl.internal.IgnoreImpl;
+import org.apache.aries.component.dsl.internal.JustOSGiImpl;
+import org.apache.aries.component.dsl.internal.OSGiImpl;
+import org.apache.aries.component.dsl.internal.OnCloseOSGiImpl;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceFactory;

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGiFactory.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiFactory.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGiFactory.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGiFactory.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiFactory.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiFactory.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGiFactory.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.osgi.functional;
+package org.apache.aries.component.dsl;
 
 /**
  * @author Carlos Sierra Andrés

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGiResult.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiResult.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGiResult.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGiResult.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiResult.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiResult.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGiResult.java
 Fri Apr 27 14:20:33 2018
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.aries.osgi.functional;
+package org.apache.aries.component.dsl;
 
 /**
  * @author Carlos Sierra Andrés

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGiRunnable.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiRunnable.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGiRunnable.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGiRunnable.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiRunnable.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiRunnable.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGiRunnable.java
 Fri Apr 27 14:20:33 2018
@@ -15,12 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.aries.osgi.functional;
+package org.apache.aries.component.dsl;
 
 import org.osgi.framework.BundleContext;
 
-import java.util.function.Consumer;
-
 /**
  * @author Carlos Sierra Andrés
  */

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Publisher.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Publisher.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Publisher.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Publisher.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Publisher.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Publisher.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Publisher.java
 Fri Apr 27 14:20:33 2018
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.aries.osgi.functional;
+package org.apache.aries.component.dsl;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Refresher.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Refresher.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Refresher.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Refresher.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Refresher.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Refresher.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Refresher.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.osgi.functional;
+package org.apache.aries.component.dsl;
 
 import java.util.function.Predicate;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Transformer.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Transformer.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Transformer.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Transformer.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Transformer.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Transformer.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Transformer.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.osgi.functional;
+package org.apache.aries.component.dsl;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Utils.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Utils.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Utils.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Utils.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Utils.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Utils.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/Utils.java
 Fri Apr 27 14:20:33 2018
@@ -1,7 +1,7 @@
-package org.apache.aries.osgi.functional;
+package org.apache.aries.component.dsl;
 
-import org.apache.aries.osgi.functional.internal.HighestRankingOSGi;
-import org.apache.aries.osgi.functional.internal.OnlyLastPublisher;
+import org.apache.aries.component.dsl.internal.HighestRankingOSGi;
+import org.apache.aries.component.dsl.internal.OnlyLastPublisher;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -10,9 +10,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 
-import static org.apache.aries.osgi.functional.OSGi.all;
-import static org.apache.aries.osgi.functional.OSGi.just;
-import static org.apache.aries.osgi.functional.OSGi.nothing;
+import static org.apache.aries.component.dsl.OSGi.just;
 
 /**
  * @author Carlos Sierra Andrés
@@ -21,11 +19,11 @@ public interface Utils {
 
     static <T> OSGi<List<T>> accumulate(OSGi<T> program) {
         return
-            just(ArrayList<T>::new).flatMap(list ->
-            all(
-                just(ArrayList<T>::new),
+            OSGi.just(ArrayList<T>::new).flatMap(list ->
+            OSGi.all(
+                OSGi.just(ArrayList<T>::new),
                 program.effects(list::add, list::remove).
-                then(just(() -> new ArrayList<>(list)
+                then(OSGi.just(() -> new ArrayList<>(list)
                 ))
             ).transform(
                 op -> new OnlyLastPublisher(op, () -> new ArrayList<>(list)))
@@ -36,20 +34,20 @@ public interface Utils {
         OSGi<T> program, Function<T, OSGi<K>> keyFun,
         Function<T, OSGi<V>> valueFun) {
 
-        return just(HashMap<K, V>::new).flatMap(map ->
-            all(
-                just(HashMap::new),
+        return OSGi.just(HashMap<K, V>::new).flatMap(map ->
+            OSGi.all(
+                OSGi.just(HashMap::new),
                 program.splitBy(
                     keyFun,
                     (k, p) ->
-                        highest(p, Comparator.naturalOrder(), q -> nothing()).
+                        highest(p, Comparator.naturalOrder(), q -> 
OSGi.nothing()).
                             flatMap(t ->
                                 valueFun.apply(t).effects(
                                     v -> map.put(k, v),
                                     __ -> map.remove(k)
                                 )
                             )
-                ).then(just(() -> new HashMap<>(map)))
+                ).then(OSGi.just(() -> new HashMap<>(map)))
             ).transform(
                 op -> new OnlyLastPublisher(op, () -> new HashMap<>(map))
             )

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function1.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function1.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function1.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function1.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function1.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function1.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function1.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function10.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function10.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function10.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function10.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function10.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function10.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function10.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function11.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function11.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function11.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function11.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function11.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function11.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function11.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function12.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function12.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function12.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function12.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function12.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function12.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function12.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function13.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function13.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function13.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function13.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function13.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function13.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function13.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function14.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function14.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function14.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function14.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function14.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function14.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function14.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function15.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function15.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function15.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function15.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function15.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function15.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function15.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function16.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function16.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function16.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function16.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function16.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function16.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function16.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function17.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function17.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function17.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function17.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function17.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function17.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function17.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function18.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function18.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function18.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function18.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function18.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function18.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function18.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function19.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function19.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function19.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function19.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function19.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function19.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function19.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function2.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function2.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function2.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function2.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function2.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function2.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function2.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function20.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function20.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function20.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function20.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function20.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function20.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function20.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function21.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function21.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function21.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function21.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function21.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function21.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function21.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function22.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function22.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function22.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function22.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function22.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function22.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function22.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function23.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function23.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function23.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function23.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function23.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function23.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function23.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function24.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function24.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function24.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function24.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function24.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function24.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function24.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function25.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function25.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function25.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function25.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function25.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function25.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function25.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function26.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function26.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function26.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function26.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function26.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function26.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function26.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function3.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function3.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function3.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function3.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function3.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function3.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function3.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function4.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function4.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function4.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function4.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function4.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function4.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function4.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function5.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function5.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function5.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function5.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function5.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function5.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function5.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function6.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function6.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function6.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function6.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function6.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function6.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function6.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function7.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function7.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function7.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function7.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function7.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function7.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function7.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function8.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function8.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function8.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function8.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function8.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function8.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function8.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function9.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function9.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function9.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function9.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function9.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/functional/Function9.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/function/Function9.java
 Fri Apr 27 14:20:33 2018
@@ -1,4 +1,4 @@
-package org.apache.aries.functional;
+package org.apache.aries.component.dsl.function;
 
 import java.util.function.Function;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/AllOSGi.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/AllOSGi.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/AllOSGi.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/AllOSGi.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/AllOSGi.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/AllOSGi.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/AllOSGi.java
 Fri Apr 27 14:20:33 2018
@@ -15,16 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.aries.osgi.functional.internal;
+package org.apache.aries.component.dsl.internal;
 
-import org.apache.aries.osgi.functional.OSGi;
-import org.apache.aries.osgi.functional.OSGiResult;
+import org.apache.aries.component.dsl.OSGi;
+import org.apache.aries.component.dsl.OSGiResult;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 import java.util.ListIterator;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BundleContextOSGiImpl.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/BundleContextOSGiImpl.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BundleContextOSGiImpl.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BundleContextOSGiImpl.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/BundleContextOSGiImpl.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/BundleContextOSGiImpl.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BundleContextOSGiImpl.java
 Fri Apr 27 14:20:33 2018
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.aries.osgi.functional.internal;
+package org.apache.aries.component.dsl.internal;
 
 import org.osgi.framework.BundleContext;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BundleOSGi.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/BundleOSGi.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BundleOSGi.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BundleOSGi.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/BundleOSGi.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/BundleOSGi.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BundleOSGi.java
 Fri Apr 27 14:20:33 2018
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.aries.osgi.functional.internal;
+package org.apache.aries.component.dsl.internal;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleEvent;

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ChangeContextOSGiImpl.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ChangeContextOSGiImpl.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ChangeContextOSGiImpl.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ChangeContextOSGiImpl.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ChangeContextOSGiImpl.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ChangeContextOSGiImpl.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ChangeContextOSGiImpl.java
 Fri Apr 27 14:20:33 2018
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.aries.osgi.functional.internal;
+package org.apache.aries.component.dsl.internal;
 
-import org.apache.aries.osgi.functional.OSGi;
+import org.apache.aries.component.dsl.OSGi;
 import org.osgi.framework.BundleContext;
 
 /**
@@ -26,7 +26,7 @@ import org.osgi.framework.BundleContext;
 public class ChangeContextOSGiImpl<T> extends OSGiImpl<T> {
 
        public ChangeContextOSGiImpl(
-               OSGi<T> program, BundleContext bundleContext) {
+        OSGi<T> program, BundleContext bundleContext) {
 
                super((b, op) -> program.run(bundleContext, op));
        }

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConcurrentDoublyLinkedList.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConcurrentDoublyLinkedList.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConcurrentDoublyLinkedList.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConcurrentDoublyLinkedList.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConcurrentDoublyLinkedList.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConcurrentDoublyLinkedList.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConcurrentDoublyLinkedList.java
 Fri Apr 27 14:20:33 2018
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.aries.osgi.functional.internal;
+package org.apache.aries.component.dsl.internal;
 
 
 /*

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConfigurationOSGiImpl.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConfigurationOSGiImpl.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConfigurationOSGiImpl.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConfigurationOSGiImpl.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConfigurationOSGiImpl.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConfigurationOSGiImpl.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConfigurationOSGiImpl.java
 Fri Apr 27 14:20:33 2018
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.aries.osgi.functional.internal;
+package org.apache.aries.component.dsl.internal;
 
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.cm.ManagedService;

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConfigurationsOSGiImpl.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConfigurationsOSGiImpl.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConfigurationsOSGiImpl.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConfigurationsOSGiImpl.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConfigurationsOSGiImpl.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConfigurationsOSGiImpl.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConfigurationsOSGiImpl.java
 Fri Apr 27 14:20:33 2018
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.aries.osgi.functional.internal;
+package org.apache.aries.component.dsl.internal;
 
-import org.apache.aries.osgi.functional.Publisher;
+import org.apache.aries.component.dsl.Publisher;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedServiceFactory;
@@ -27,8 +27,6 @@ import java.util.Hashtable;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Function;
 
 /**
  * @author Carlos Sierra Andrés

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/EffectsOSGi.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/EffectsOSGi.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/EffectsOSGi.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/EffectsOSGi.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/EffectsOSGi.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/EffectsOSGi.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/EffectsOSGi.java
 Fri Apr 27 14:20:33 2018
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.aries.osgi.functional.internal;
+package org.apache.aries.component.dsl.internal;
 
 /**
  * @author Carlos Sierra Andrés

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/HighestRankingOSGi.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/HighestRankingOSGi.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/HighestRankingOSGi.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/HighestRankingOSGi.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/HighestRankingOSGi.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/HighestRankingOSGi.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/HighestRankingOSGi.java
 Fri Apr 27 14:20:33 2018
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.aries.osgi.functional.internal;
+package org.apache.aries.component.dsl.internal;
 
-import org.apache.aries.osgi.functional.OSGi;
-import org.apache.aries.osgi.functional.OSGiResult;
+import org.apache.aries.component.dsl.OSGi;
+import org.apache.aries.component.dsl.OSGiResult;
 
 import java.util.Comparator;
 import java.util.PriorityQueue;

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/IgnoreImpl.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/IgnoreImpl.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/IgnoreImpl.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/IgnoreImpl.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/IgnoreImpl.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/IgnoreImpl.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/IgnoreImpl.java
 Fri Apr 27 14:20:33 2018
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.aries.osgi.functional.internal;
+package org.apache.aries.component.dsl.internal;
 
-import org.apache.aries.osgi.functional.OSGi;
+import org.apache.aries.component.dsl.OSGi;
 
 /**
  * @author Carlos Sierra Andrés

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/JustOSGiImpl.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/JustOSGiImpl.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/JustOSGiImpl.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/JustOSGiImpl.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/JustOSGiImpl.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/JustOSGiImpl.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/JustOSGiImpl.java
 Fri Apr 27 14:20:33 2018
@@ -16,14 +16,13 @@
  */
 
 
-package org.apache.aries.osgi.functional.internal;
+package org.apache.aries.component.dsl.internal;
 
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.ListIterator;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 

Copied: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/NothingOSGiImpl.java
 (from r1830338, 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/NothingOSGiImpl.java)
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/NothingOSGiImpl.java?p2=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/NothingOSGiImpl.java&p1=aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/NothingOSGiImpl.java&r1=1830338&r2=1830357&rev=1830357&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/NothingOSGiImpl.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/NothingOSGiImpl.java
 Fri Apr 27 14:20:33 2018
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.aries.osgi.functional.internal;
+package org.apache.aries.component.dsl.internal;
 
-import org.apache.aries.osgi.functional.OSGi;
+import org.apache.aries.component.dsl.OSGi;
 
 /**
  * @author Carlos Sierra Andrés

Reply via email to