Author: alien11689 Date: Sun Oct 1 19:50:04 2017 New Revision: 1810275 URL: http://svn.apache.org/viewvc?rev=1810275&view=rev Log: [MAINTENANCE] Refactor tests in BMP
Added: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceA.java - copied, changed from r1810274, aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceA.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceB.java - copied, changed from r1810274, aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceB.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceC.java - copied, changed from r1810274, aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceC.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceD.java - copied, changed from r1810274, aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceD.java Removed: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceA.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceB.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceC.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceD.java Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/TestBeanForRef.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean3.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProducedWithConstructor.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ParentBean.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceABImpl.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl1.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl2.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl3.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImplQualified.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferencesParent.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithRanking.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithoutMethodsAnnotation.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerListBean.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerProducer.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduce.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduceWithoutAnnotation.java Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java Sun Oct 1 19:50:04 2017 @@ -23,9 +23,9 @@ import org.apache.aries.blueprint.plugin import org.apache.aries.blueprint.plugin.model.TransactionalDef; import org.apache.aries.blueprint.plugin.test.MyBean1; import org.apache.aries.blueprint.plugin.test.MyProduced; -import org.apache.aries.blueprint.plugin.test.ServiceA; -import org.apache.aries.blueprint.plugin.test.ServiceB; -import org.apache.aries.blueprint.plugin.test.ServiceD; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceD; import org.apache.aries.blueprint.plugin.test.bean.BasicBean; import org.apache.aries.blueprint.plugin.test.bean.BeanWithCallbackMethods; import org.apache.aries.blueprint.plugin.test.bean.NamedBean; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/TestBeanForRef.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/TestBeanForRef.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/TestBeanForRef.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/TestBeanForRef.java Sun Oct 1 19:50:04 2017 @@ -23,8 +23,8 @@ import javax.inject.Singleton; import javax.persistence.EntityManager; import javax.persistence.PersistenceUnit; -import org.apache.aries.blueprint.plugin.test.ServiceA; -import org.apache.aries.blueprint.plugin.test.ServiceB; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java Sun Oct 1 19:50:04 2017 @@ -18,6 +18,8 @@ */ package org.apache.aries.blueprint.plugin.test; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB; import org.ops4j.pax.cdi.api.OsgiService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean3.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean3.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean3.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean3.java Sun Oct 1 19:50:04 2017 @@ -21,6 +21,8 @@ package org.apache.aries.blueprint.plugi import javax.inject.Inject; import javax.inject.Named; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java Sun Oct 1 19:50:04 2017 @@ -19,6 +19,9 @@ package org.apache.aries.blueprint.plugin.test; import org.apache.aries.blueprint.plugin.AnnotatedService; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceC; import org.ops4j.pax.cdi.api.OsgiService; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.DependsOn; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java Sun Oct 1 19:50:04 2017 @@ -18,6 +18,7 @@ */ package org.apache.aries.blueprint.plugin.test; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import org.springframework.context.annotation.DependsOn; import javax.inject.Named; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java Sun Oct 1 19:50:04 2017 @@ -18,6 +18,7 @@ */ package org.apache.aries.blueprint.plugin.test; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceD; import org.ops4j.pax.cdi.api.OsgiService; import javax.inject.Singleton; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java Sun Oct 1 19:50:04 2017 @@ -18,6 +18,8 @@ */ package org.apache.aries.blueprint.plugin.test; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceC; import org.ops4j.pax.cdi.api.OsgiService; import org.springframework.beans.factory.annotation.Value; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java Sun Oct 1 19:50:04 2017 @@ -18,6 +18,7 @@ */ package org.apache.aries.blueprint.plugin.test; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import org.springframework.context.annotation.Lazy; import javax.inject.Inject; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProducedWithConstructor.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProducedWithConstructor.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProducedWithConstructor.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProducedWithConstructor.java Sun Oct 1 19:50:04 2017 @@ -18,6 +18,7 @@ */ package org.apache.aries.blueprint.plugin.test; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import org.ops4j.pax.cdi.api.OsgiService; import javax.inject.Inject; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ParentBean.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ParentBean.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ParentBean.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ParentBean.java Sun Oct 1 19:50:04 2017 @@ -25,6 +25,7 @@ import javax.persistence.PersistenceCont import javax.persistence.PersistenceUnit; import javax.transaction.Transactional; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import org.springframework.beans.factory.annotation.Autowired; public class ParentBean { Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceABImpl.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceABImpl.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceABImpl.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceABImpl.java Sun Oct 1 19:50:04 2017 @@ -20,6 +20,8 @@ package org.apache.aries.blueprint.plugi import javax.inject.Singleton; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB; import org.ops4j.pax.cdi.api.OsgiServiceProvider; @Singleton Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl1.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl1.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl1.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl1.java Sun Oct 1 19:50:04 2017 @@ -18,6 +18,8 @@ */ package org.apache.aries.blueprint.plugin.test; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; + import javax.inject.Named; @Named("my1") Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl2.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl2.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl2.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl2.java Sun Oct 1 19:50:04 2017 @@ -21,6 +21,7 @@ package org.apache.aries.blueprint.plugi import javax.inject.Named; import javax.inject.Singleton; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import org.ops4j.pax.cdi.api.OsgiServiceProvider; import org.springframework.beans.factory.annotation.Value; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl3.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl3.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl3.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl3.java Sun Oct 1 19:50:04 2017 @@ -20,6 +20,7 @@ package org.apache.aries.blueprint.plugi import javax.inject.Singleton; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import org.ops4j.pax.cdi.api.OsgiServiceProvider; @Singleton Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImplQualified.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImplQualified.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImplQualified.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImplQualified.java Sun Oct 1 19:50:04 2017 @@ -19,6 +19,7 @@ package org.apache.aries.blueprint.plugin.test; import org.apache.aries.blueprint.plugin.AnnotatedService; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import javax.inject.Singleton; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferencesParent.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferencesParent.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferencesParent.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferencesParent.java Sun Oct 1 19:50:04 2017 @@ -21,11 +21,13 @@ package org.apache.aries.blueprint.plugi import javax.inject.Inject; import javax.inject.Named; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB; import org.ops4j.pax.cdi.api.OsgiService; public class ServiceReferencesParent { - @Inject @OsgiService(filter="(type=B1)") ServiceB serviceB; + @Inject @OsgiService(filter="(type=B1)") + ServiceB serviceB; @Named("serviceB2Id") @Inject @OsgiService(filter="(type=B2)") ServiceB serviceB2; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java Sun Oct 1 19:50:04 2017 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -19,7 +19,6 @@ package org.apache.aries.blueprint.plugin.test.cditransactional; import org.apache.aries.blueprint.plugin.test.ParentBean; -import org.springframework.context.annotation.Lazy; import javax.annotation.PostConstruct; import javax.inject.Singleton; @@ -27,20 +26,9 @@ import javax.transaction.cdi.Transaction import javax.transaction.cdi.Transactional.TxType; @Singleton -@Transactional(value=TxType.REQUIRES_NEW) -@Lazy +@Transactional(value = TxType.REQUIRES_NEW) public class CdiTransactionalAnnotatedBean extends ParentBean { - public void overridenInit() { - // By overriding the method and removing the annotation, this method has lost its - // @PostConstruct method because it isn't @Inherited - } - - @PostConstruct - public void init() { - - } - @Transactional(TxType.NOT_SUPPORTED) public void txNotSupported() { } Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java Sun Oct 1 19:50:04 2017 @@ -20,7 +20,6 @@ package org.apache.aries.blueprint.plugi import org.apache.aries.blueprint.annotation.config.ConfigProperties; import org.apache.aries.blueprint.plugin.test.MyProducedWithConstructor; -import org.ops4j.pax.cdi.api.OsgiService; import javax.enterprise.inject.Produces; import javax.inject.Inject; Copied: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceA.java (from r1810274, aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceA.java) URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceA.java?p2=aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceA.java&p1=aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceA.java&r1=1810274&r2=1810275&rev=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceA.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceA.java Sun Oct 1 19:50:04 2017 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.aries.blueprint.plugin.test; +package org.apache.aries.blueprint.plugin.test.interfaces; public interface ServiceA { Copied: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceB.java (from r1810274, aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceB.java) URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceB.java?p2=aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceB.java&p1=aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceB.java&r1=1810274&r2=1810275&rev=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceB.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceB.java Sun Oct 1 19:50:04 2017 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.aries.blueprint.plugin.test; +package org.apache.aries.blueprint.plugin.test.interfaces; public interface ServiceB { Copied: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceC.java (from r1810274, aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceC.java) URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceC.java?p2=aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceC.java&p1=aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceC.java&r1=1810274&r2=1810275&rev=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceC.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceC.java Sun Oct 1 19:50:04 2017 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.aries.blueprint.plugin.test; +package org.apache.aries.blueprint.plugin.test.interfaces; public interface ServiceC { Copied: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceD.java (from r1810274, aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceD.java) URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceD.java?p2=aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceD.java&p1=aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceD.java&r1=1810274&r2=1810275&rev=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceD.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceD.java Sun Oct 1 19:50:04 2017 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.aries.blueprint.plugin.test; +package org.apache.aries.blueprint.plugin.test.interfaces; public interface ServiceD { } Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java Sun Oct 1 19:50:04 2017 @@ -19,7 +19,7 @@ package org.apache.aries.blueprint.plugin.test.osgiserviceprovider; import org.apache.aries.blueprint.plugin.test.MyProduced; -import org.apache.aries.blueprint.plugin.test.ServiceA; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import org.ops4j.pax.cdi.api.OsgiServiceProvider; import org.ops4j.pax.cdi.api.Properties; import org.ops4j.pax.cdi.api.Property; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithRanking.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithRanking.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithRanking.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithRanking.java Sun Oct 1 19:50:04 2017 @@ -18,7 +18,7 @@ */ package org.apache.aries.blueprint.plugin.test.osgiserviceprovider; -import org.apache.aries.blueprint.plugin.test.ServiceA; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import org.ops4j.pax.cdi.api.OsgiServiceProvider; import org.ops4j.pax.cdi.api.Properties; import org.ops4j.pax.cdi.api.Property; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java Sun Oct 1 19:50:04 2017 @@ -21,7 +21,7 @@ package org.apache.aries.blueprint.plugi import com.google.inject.Singleton; import org.apache.aries.blueprint.annotation.referencelistener.Cardinality; import org.apache.aries.blueprint.annotation.referencelistener.ReferenceListener; -import org.apache.aries.blueprint.plugin.test.ServiceA; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import javax.inject.Named; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithoutMethodsAnnotation.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithoutMethodsAnnotation.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithoutMethodsAnnotation.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithoutMethodsAnnotation.java Sun Oct 1 19:50:04 2017 @@ -20,9 +20,8 @@ package org.apache.aries.blueprint.plugi import org.apache.aries.blueprint.annotation.referencelistener.Cardinality; import org.apache.aries.blueprint.annotation.referencelistener.ReferenceListener; -import org.apache.aries.blueprint.plugin.test.ServiceA; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; -import javax.inject.Named; import javax.inject.Singleton; @ReferenceListener(referenceInterface = ServiceA.class, cardinality = Cardinality.MULTIPLE, Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerListBean.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerListBean.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerListBean.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerListBean.java Sun Oct 1 19:50:04 2017 @@ -22,7 +22,7 @@ import org.apache.aries.blueprint.annota import org.apache.aries.blueprint.annotation.referencelistener.Bind; import org.apache.aries.blueprint.annotation.referencelistener.ReferenceListener; import org.apache.aries.blueprint.annotation.referencelistener.Unbind; -import org.apache.aries.blueprint.plugin.test.ServiceA; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import javax.inject.Singleton; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerProducer.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerProducer.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerProducer.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerProducer.java Sun Oct 1 19:50:04 2017 @@ -21,7 +21,7 @@ package org.apache.aries.blueprint.plugi import org.apache.aries.blueprint.annotation.referencelistener.Availability; import org.apache.aries.blueprint.annotation.referencelistener.Cardinality; import org.apache.aries.blueprint.annotation.referencelistener.ReferenceListener; -import org.apache.aries.blueprint.plugin.test.ServiceB; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB; import javax.enterprise.inject.Produces; import javax.inject.Named; Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduce.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduce.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduce.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduce.java Sun Oct 1 19:50:04 2017 @@ -20,7 +20,7 @@ package org.apache.aries.blueprint.plugi import org.apache.aries.blueprint.annotation.referencelistener.Bind; import org.apache.aries.blueprint.annotation.referencelistener.Unbind; -import org.apache.aries.blueprint.plugin.test.ServiceB; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB; public class ReferenceListenerToProduce { @Bind Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduceWithoutAnnotation.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduceWithoutAnnotation.java?rev=1810275&r1=1810274&r2=1810275&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduceWithoutAnnotation.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduceWithoutAnnotation.java Sun Oct 1 19:50:04 2017 @@ -18,7 +18,7 @@ */ package org.apache.aries.blueprint.plugin.test.referencelistener; -import org.apache.aries.blueprint.plugin.test.ServiceB; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB; public class ReferenceListenerToProduceWithoutAnnotation { public void addMe(ServiceB serviceB) {