Author: jmarino
Date: Fri Jan 5 01:34:54 2007
New Revision: 492948
URL: http://svn.apache.org/viewvc?view=rev&rev=492948
Log:
convert builder registry to use new EagerInit annotation
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
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/builder/BuilderRegistryTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.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/bootstrap/DefaultBootstrapper.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?view=diff&rev=492948&r1=492947&r2=492948
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
Fri Jan 5 01:34:54 2007
@@ -242,8 +242,7 @@
* @return a new Builder
*/
private Builder createBuilder(ScopeRegistry scopeRegistry) {
- BuilderRegistryImpl builderRegistry = new
BuilderRegistryImpl(scopeRegistry);
- builderRegistry.setWireService(new JDKWireService());
+ BuilderRegistryImpl builderRegistry = new
BuilderRegistryImpl(scopeRegistry, new JDKWireService());
SystemCompositeBuilder builder = new
SystemCompositeBuilder(builderRegistry, createConnector());
builderRegistry.register(SystemCompositeImplementation.class, builder);
builderRegistry.register(SystemImplementation.class, new
SystemComponentBuilder());
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java?view=diff&rev=492948&r1=492947&r2=492948
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
Fri Jan 5 01:34:54 2007
@@ -22,7 +22,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.EagerInit;
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.annotation.Autowire;
@@ -57,6 +57,7 @@
*
* @version $Rev$ $Date$
*/
[EMAIL PROTECTED]
public class BuilderRegistryImpl implements BuilderRegistry {
protected WireService wireService;
protected ScopeRegistry scopeRegistry;
@@ -68,24 +69,8 @@
BindingBuilder<? extends BindingDefinition>> bindingBuilders =
new HashMap<Class<? extends BindingDefinition>, BindingBuilder<?
extends BindingDefinition>>();
- public BuilderRegistryImpl() {
- }
-
- public BuilderRegistryImpl(ScopeRegistry scopeRegistry) {
+ public BuilderRegistryImpl(@Autowire ScopeRegistry scopeRegistry,
@Autowire WireService wireService) {
this.scopeRegistry = scopeRegistry;
- }
-
- @Init(eager = true)
- public void init() {
- }
-
- @Autowire
- public void setScopeRegistry(ScopeRegistry scopeRegistry) {
- this.scopeRegistry = scopeRegistry;
- }
-
- @Autowire
- public void setWireService(WireService wireService) {
this.wireService = wireService;
}
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=492948&r1=492947&r2=492948
==============================================================================
---
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
Fri Jan 5 01:34:54 2007
@@ -44,6 +44,6 @@
if (annotation == null) {
return;
}
- type.setInitLevel(annotation.level());
+ type.setInitLevel(annotation.value());
}
}
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java?view=diff&rev=492948&r1=492947&r2=492948
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java
Fri Jan 5 01:34:54 2007
@@ -25,6 +25,7 @@
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.builder.BindingBuilder;
import org.apache.tuscany.spi.builder.BuilderConfigException;
+import org.apache.tuscany.spi.builder.BuilderRegistry;
import org.apache.tuscany.spi.builder.ComponentBuilder;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.Component;
@@ -55,11 +56,12 @@
*/
public class BuilderRegistryTestCase extends TestCase {
private DeploymentContext deploymentContext;
- private BuilderRegistryImpl registry;
+ //private BuilderRegistryImpl registry;
private CompositeComponent parent;
public void testRegistration() throws Exception {
MockBuilder builder = new MockBuilder();
+ BuilderRegistry registry = new BuilderRegistryImpl(null, null);
registry.register(CompositeImplementation.class, builder);
CompositeImplementation implementation = new CompositeImplementation();
ComponentDefinition<CompositeImplementation> componentDefinition =
@@ -76,7 +78,7 @@
);
EasyMock.expectLastCall().times(2);
EasyMock.replay(wireService);
- registry.setWireService(wireService);
+ BuilderRegistry registry = new BuilderRegistryImpl(null, wireService);
ServiceBinding binding = EasyMock.createNiceMock(ServiceBinding.class);
EasyMock.replay(binding);
BindingBuilder<MockBindingDefinition> builder =
EasyMock.createMock(BindingBuilder.class);
@@ -103,7 +105,7 @@
);
EasyMock.expectLastCall().times(2);
EasyMock.replay(wireService);
- registry.setWireService(wireService);
+ BuilderRegistry registry = new BuilderRegistryImpl(null, wireService);
ReferenceBinding binding =
EasyMock.createNiceMock(ReferenceBinding.class);
EasyMock.replay(binding);
BindingBuilder<MockBindingDefinition> builder =
EasyMock.createMock(BindingBuilder.class);
@@ -128,7 +130,7 @@
wireService.createWires(EasyMock.isA(AtomicComponent.class),
EasyMock.isA(ComponentDefinition.class));
EasyMock.replay(wireService);
- registry.setWireService(wireService);
+ BuilderRegistry registry = new BuilderRegistryImpl(null, wireService);
AtomicComponent component =
EasyMock.createNiceMock(AtomicComponent.class);
EasyMock.replay(component);
@@ -149,7 +151,6 @@
protected void setUp() throws Exception {
super.setUp();
- registry = new BuilderRegistryImpl();
deploymentContext = new RootDeploymentContext(null, null, null, null);
parent = EasyMock.createNiceMock(CompositeComponent.class);
EasyMock.replay(parent);
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java?view=diff&rev=492948&r1=492947&r2=492948
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
Fri Jan 5 01:34:54 2007
@@ -72,8 +72,7 @@
CompositeBuilder builder = new CompositeBuilder();
WireService wireService = new JDKWireService();
builder.setWireService(wireService);
- BuilderRegistryImpl builderRegistry = new BuilderRegistryImpl();
- builderRegistry.setWireService(wireService);
+ BuilderRegistryImpl builderRegistry = new BuilderRegistryImpl(null,
wireService);
JavaComponentBuilder jBuilder = new JavaComponentBuilder();
jBuilder.setWireService(wireService);
builderRegistry.register(JavaImplementation.class, jBuilder);
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=492948&r1=492947&r2=492948
==============================================================================
---
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
Fri Jan 5 01:34:54 2007
@@ -35,7 +35,7 @@
private class NoLevel {
}
- @EagerInit(level = 1)
+ @EagerInit(1)
private class Level {
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
