You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2007/02/22 05:18:49 UTC

svn commit: r510387 - in /incubator/tuscany/java/sca/kernel/core/src: main/java/org/apache/tuscany/core/implementation/processor/ test/java/org/apache/tuscany/core/component/scope/ test/java/org/apache/tuscany/core/implementation/processor/

Author: jmarino
Date: Wed Feb 21 20:18:48 2007
New Revision: 510387

URL: http://svn.apache.org/viewvc?view=rev&rev=510387
Log:
support for SCA 1.0 @EagerInit semantics

Modified:
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessor.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessorTestCase.java

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessor.java?view=diff&rev=510387&r1=510386&r2=510387
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessor.java Wed Feb 21 20:18:48 2007
@@ -54,6 +54,6 @@
                 return;
             }
         }
-        type.setInitLevel(annotation.value());
+        type.setInitLevel(50);
     }
 }

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java?view=diff&rev=510387&r1=510386&r2=510387
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java Wed Feb 21 20:18:48 2007
@@ -64,7 +64,7 @@
         Class[] interfaces = targetClass.getInterfaces();
         EagerInit eager = targetClass.getAnnotation(EagerInit.class);
         if (eager != null) {
-            sourceConfig.setInitLevel(eager.value());
+            sourceConfig.setInitLevel(50);
         }
         Method setter = null;
         for (Class interfaze : interfaces) {
@@ -106,7 +106,7 @@
         configuration.setInstanceFactory(new PojoObjectFactory(clazz.getConstructor()));
         EagerInit eager = clazz.getAnnotation(EagerInit.class);
         if (eager != null) {
-            configuration.setInitLevel(eager.value());
+            configuration.setInitLevel(50);
         }
         Method[] methods = clazz.getMethods();
         for (Method method : methods) {

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessorTestCase.java?view=diff&rev=510387&r1=510386&r2=510387
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessorTestCase.java Wed Feb 21 20:18:48 2007
@@ -19,16 +19,8 @@
         EagerInitProcessor processor = new EagerInitProcessor();
         PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
             new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
-        processor.visitClass(null, NoLevel.class, type, null);
-        assertEquals(50, type.getInitLevel());
-    }
-
-    public void testLevel() throws ProcessingException {
-        EagerInitProcessor processor = new EagerInitProcessor();
-        PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
-            new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
         processor.visitClass(null, Level.class, type, null);
-        assertEquals(1, type.getInitLevel());
+        assertEquals(50, type.getInitLevel());
     }
 
     public void testSubclass() throws ProcessingException {
@@ -36,14 +28,10 @@
         PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
             new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
         processor.visitClass(null, SubClass.class, type, null);
-        assertEquals(1, type.getInitLevel());
+        assertEquals(50, type.getInitLevel());
     }
 
     @EagerInit
-    private class NoLevel {
-    }
-
-    @EagerInit(1)
     private class Level {
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org