You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2013/10/14 22:09:04 UTC
svn commit: r1532050 - in /felix/trunk/dependencymanager/test2/src: main/java/org/apache/felix/dependencymanager/test2/components/ test/java/org/apache/felix/dependencymanager/test2/integration/annotations/

Author: pderop
Date: Mon Oct 14 20:09:04 2013
New Revision: 1532050

URL: http://svn.apache.org/r1532050
Log:
pax-exam 3.0.0 ...

Modified:
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java

Modified: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java?rev=1532050&r1=1532049&r2=1532050&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java Mon Oct 14 20:09:04 2013
@@ -48,7 +48,9 @@ public class AspectLifecycleWithDynamicP
 
     @Component
     public static class ServiceProvider implements ServiceInterface {
-        @ServiceDependency(filter = "(name=aspectLifecycle.dynamicProxy.ServiceProvider)")
+        public final static String ENSURE = "AspectLifecycleWithDynamicProxyAnnotation.ServiceProvider";
+        
+        @ServiceDependency(filter = "(name=" + ENSURE + ")")
         protected volatile Ensure m_sequencer;
 
         public void run() {
@@ -58,10 +60,12 @@ public class AspectLifecycleWithDynamicP
 
     @AspectService(ranking = 10, service = ServiceInterface.class, factoryMethod = "create")
     public static class ServiceProviderAspect implements InvocationHandler {
+        public final static String ENSURE = "AspectLifecycleWithDynamicProxyAnnotation.ServiceProviderAspect";
+
         protected volatile boolean m_initCalled;
         protected volatile Ensure m_sequencer;
 
-        @ServiceDependency(filter = "(name=aspectLifecycle.dynamicProxy.ServiceProviderAspect)")
+        @ServiceDependency(filter = "(name=" + ENSURE + ")")
         protected void bind(Ensure sequencer) {
             m_sequencer = sequencer;
             m_sequencer.step(2);

Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java?rev=1532050&r1=1532049&r2=1532050&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java Mon Oct 14 20:09:04 2013
@@ -18,6 +18,8 @@
 */
 package org.apache.felix.dependencymanager.test2.integration.annotations;
 
+import org.apache.felix.dependencymanager.test2.components.AspectLifecycleWithDynamicProxyAnnotation.ServiceProvider;
+import org.apache.felix.dependencymanager.test2.components.AspectLifecycleWithDynamicProxyAnnotation.ServiceProviderAspect;
 import org.apache.felix.dependencymanager.test2.components.Ensure;
 import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.junit.Test;
@@ -35,11 +37,11 @@ public class AspectLifecycleWithDynamicP
     public void testAnnotatedAspect() {
         Ensure e = new Ensure();
         // Provide the Sequencer server to the ServiceProvider service
-        ServiceRegistration sr1 = register(e, "aspectLifecycle.dynamicProxy.ServiceProvider");
+        ServiceRegistration sr1 = register(e, ServiceProvider.ENSURE);
         // Check if the ServiceProvider has been injected in the AspectTest service.
         e.waitForStep(1, 10000);
         // Provide the Sequencer server to the ServiceProviderAspect service
-        ServiceRegistration sr2 = register(e, "aspectLifecycle.dynamicProxy.ServiceProviderAspect");
+        ServiceRegistration sr2 = register(e, ServiceProviderAspect.ENSURE);
         // Check if the AspectTest has been injected with the aspect
         e.waitForStep(3, 10000);
         // Remove the ServiceProviderAspect service