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/28 20:32:02 UTC
svn commit: r512917 [1/2] - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/binding/local/
core/src/main/java/org/apache/tuscany/core/builder/
core/src/main/java/org/apache/tuscany/core/component/scope/
core/src/main/j...
Author: jmarino
Date: Wed Feb 28 11:31:59 2007
New Revision: 512917
URL: http://svn.apache.org/viewvc?view=rev&rev=512917
Log:
remove use of @Autowire in kernel
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalBindingLoader.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/builder/ConnectorImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WiringExceptionFormatter.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataTypeLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Input2InputTransformer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/MediatorImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Output2OutputTransformer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemCompositeBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementationLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/MonitorProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/PropertyProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ServiceProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemImplementationLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/DependencyLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderExceptionFormatter.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/AbstractMarshallerExtension.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyObjectFactoryImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionDirectoryWatcher.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionProcessorRegistryImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/JavaContributionProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/ScdlContributionProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/AbstractExtensionDeployer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/work/jsr237/Jsr237WorkScheduler.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatter.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyService.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/TransformerExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaInterfaceProcessorExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/policy/SourcePolicyBuilderExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/policy/TargetPolicyBuilderExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/discovery/AbstractDiscoveryService.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WirePostProcessorExtension.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalBindingLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalBindingLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalBindingLoader.java Wed Feb 28 11:31:59 2007
@@ -24,7 +24,8 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -44,7 +45,7 @@
*
* @param registry the LoaderRegistry this loader should register with
*/
- public LocalBindingLoader(@Autowire LoaderRegistry registry) {
+ public LocalBindingLoader(@Reference LoaderRegistry registry) {
super(registry);
}
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=512917&r1=512916&r2=512917
==============================================================================
--- 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 Wed Feb 28 11:31:59 2007
@@ -24,7 +24,6 @@
import org.osoa.sca.annotations.EagerInit;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.BindingBuilder;
import org.apache.tuscany.spi.builder.BuilderException;
import org.apache.tuscany.spi.builder.BuilderRegistry;
@@ -66,7 +65,7 @@
private final Map<Class<? extends BindingDefinition>, BindingBuilder<? extends BindingDefinition>> bindingBuilders =
new HashMap<Class<? extends BindingDefinition>, BindingBuilder<? extends BindingDefinition>>();
- public BuilderRegistryImpl(@Autowire ScopeRegistry scopeRegistry) {
+ public BuilderRegistryImpl(@org.osoa.sca.annotations.Reference ScopeRegistry scopeRegistry) {
this.scopeRegistry = scopeRegistry;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java Wed Feb 28 11:31:59 2007
@@ -26,7 +26,6 @@
import org.osoa.sca.annotations.Constructor;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.Connector;
import org.apache.tuscany.spi.builder.WiringException;
import org.apache.tuscany.spi.component.AtomicComponent;
@@ -79,10 +78,10 @@
@Constructor
public ConnectorImpl(
- @Autowire WirePostProcessorRegistry processorRegistry,
- @Autowire ComponentManager componentManager,
- @Autowire WorkScheduler scheduler,
- @Autowire WorkContext workContext) {
+ @org.osoa.sca.annotations.Reference WirePostProcessorRegistry processorRegistry,
+ @org.osoa.sca.annotations.Reference ComponentManager componentManager,
+ @org.osoa.sca.annotations.Reference WorkScheduler scheduler,
+ @org.osoa.sca.annotations.Reference WorkContext workContext) {
this.postProcessorRegistry = processorRegistry;
this.componentManager = componentManager;
this.scheduler = scheduler;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WiringExceptionFormatter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WiringExceptionFormatter.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WiringExceptionFormatter.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WiringExceptionFormatter.java Wed Feb 28 11:31:59 2007
@@ -22,8 +22,8 @@
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.WiringException;
import org.apache.tuscany.host.monitor.ExceptionFormatter;
@@ -38,7 +38,7 @@
public class WiringExceptionFormatter implements ExceptionFormatter {
private FormatterRegistry factory;
- public WiringExceptionFormatter(@Autowire FormatterRegistry factory) {
+ public WiringExceptionFormatter(@Reference FormatterRegistry factory) {
this.factory = factory;
factory.register(this);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java Wed Feb 28 11:31:59 2007
@@ -19,10 +19,10 @@
package org.apache.tuscany.core.component.scope;
import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Reference;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.ScopeContainerMonitor;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.model.Scope;
@@ -38,7 +38,7 @@
public class CompositeScopeObjectFactory implements ObjectFactory<CompositeScopeContainer> {
private ScopeContainerMonitor monitor;
- public CompositeScopeObjectFactory(@Autowire ScopeRegistry registry,
+ public CompositeScopeObjectFactory(@Reference ScopeRegistry registry,
@Monitor ScopeContainerMonitor monitor) {
registry.registerFactory(Scope.COMPOSITE, this);
this.monitor = monitor;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeObjectFactory.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeObjectFactory.java Wed Feb 28 11:31:59 2007
@@ -19,10 +19,10 @@
package org.apache.tuscany.core.component.scope;
import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Reference;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.ScopeContainerMonitor;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.component.WorkContext;
@@ -42,9 +42,9 @@
private Store store;
private ScopeContainerMonitor monitor;
- public ConversationalScopeObjectFactory(@Autowire ScopeRegistry registry,
- @Autowire WorkContext context,
- @Autowire Store store,
+ public ConversationalScopeObjectFactory(@Reference ScopeRegistry registry,
+ @Reference WorkContext context,
+ @Reference Store store,
@Monitor ScopeContainerMonitor monitor) {
registry.registerFactory(Scope.CONVERSATION, this);
this.context = context;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java Wed Feb 28 11:31:59 2007
@@ -19,10 +19,10 @@
package org.apache.tuscany.core.component.scope;
import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Reference;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.ScopeContainerMonitor;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.component.WorkContext;
@@ -40,8 +40,8 @@
private WorkContext context;
private ScopeContainerMonitor monitor;
- public HttpSessionScopeObjectFactory(@Autowire ScopeRegistry registry,
- @Autowire WorkContext context,
+ public HttpSessionScopeObjectFactory(@Reference ScopeRegistry registry,
+ @Reference WorkContext context,
@Monitor ScopeContainerMonitor monitor) {
registry.registerFactory(Scope.SESSION, this);
this.context = context;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java Wed Feb 28 11:31:59 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.core.component.scope;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.annotation.Autowire;
@@ -36,7 +38,7 @@
private ScopeContainerMonitor monitor;
- public RequestScopeObjectFactory(@Autowire WorkContext context, @Monitor ScopeContainerMonitor monitor) {
+ public RequestScopeObjectFactory(@Reference WorkContext context, @Monitor ScopeContainerMonitor monitor) {
this.context = context;
this.monitor = monitor;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java Wed Feb 28 11:31:59 2007
@@ -19,10 +19,10 @@
package org.apache.tuscany.core.component.scope;
import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Reference;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.ScopeContainerMonitor;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.component.WorkContext;
@@ -40,8 +40,8 @@
private WorkContext context;
private ScopeContainerMonitor monitor;
- public StatelessScopeObjectFactory(@Autowire ScopeRegistry registry,
- @Autowire WorkContext context,
+ public StatelessScopeObjectFactory(@Reference ScopeRegistry registry,
+ @Reference WorkContext context,
@Monitor ScopeContainerMonitor monitor) {
registry.registerFactory(Scope.STATELESS, this);
this.context = context;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java Wed Feb 28 11:31:59 2007
@@ -23,8 +23,8 @@
import java.util.Map;
import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.databinding.Mediator;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -42,7 +42,7 @@
private Mediator mediator;
@Constructor({"mediator"})
- public DataBindingWirePostProcessor(@Autowire Mediator mediator) {
+ public DataBindingWirePostProcessor(@Reference Mediator mediator) {
super();
this.mediator = mediator;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataTypeLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataTypeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataTypeLoader.java Wed Feb 28 11:31:59 2007
@@ -22,7 +22,9 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.InvalidValueException;
@@ -32,8 +34,6 @@
import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.spi.model.ModelObject;
-import org.osoa.sca.annotations.Constructor;
-
/**
* The StAX loader for data type
*/
@@ -42,7 +42,7 @@
new QName("http://tuscany.apache.org/xmlns/sca/databinding/1.0", "databinding");
@Constructor({"registry"})
- public DataTypeLoader(@Autowire LoaderRegistry registry) {
+ public DataTypeLoader(@Reference LoaderRegistry registry) {
super(registry);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Input2InputTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Input2InputTransformer.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Input2InputTransformer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Input2InputTransformer.java Wed Feb 28 11:31:59 2007
@@ -39,6 +39,7 @@
import org.apache.tuscany.spi.model.Operation;
import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.Reference;
/**
* This is a special transformer to transform the input from one IDL to the
@@ -71,7 +72,7 @@
/**
* @param mediator the mediator to set
*/
- @Autowire
+ @Reference
public void setMediator(Mediator mediator) {
this.mediator = mediator;
}
@@ -79,7 +80,7 @@
/**
* @param dataBindingRegistry the dataBindingRegistry to set
*/
- @Autowire
+ @Reference
public void setDataBindingRegistry(DataBindingRegistry dataBindingRegistry) {
this.dataBindingRegistry = dataBindingRegistry;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/MediatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/MediatorImpl.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/MediatorImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/MediatorImpl.java Wed Feb 28 11:31:59 2007
@@ -21,7 +21,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
import org.apache.tuscany.spi.databinding.DataPipe;
import org.apache.tuscany.spi.databinding.Mediator;
@@ -32,7 +34,6 @@
import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.TransformerRegistry;
import org.apache.tuscany.spi.model.DataType;
-import org.osoa.sca.annotations.Scope;
/**
* Default Mediator implementation
@@ -44,7 +45,7 @@
private TransformerRegistry transformerRegistry;
- @Autowire
+ @Reference
public void setTransformerRegistry(TransformerRegistry transformerRegistry) {
this.transformerRegistry = transformerRegistry;
}
@@ -52,15 +53,14 @@
/**
* @param dataBindingRegistry the dataBindingRegistry to set
*/
- @Autowire
+ @Reference
public void setDataBindingRegistry(DataBindingRegistry dataBindingRegistry) {
this.dataBindingRegistry = dataBindingRegistry;
}
/**
- * @see org.apache.tuscany.spi.databinding.Mediator#mediate(java.lang.Object,
- * org.apache.tuscany.spi.model.DataType,
- * org.apache.tuscany.spi.model.DataType, Map)
+ * @see org.apache.tuscany.spi.databinding.Mediator#mediate(java.lang.Object,org.apache.tuscany.spi.model.DataType,
+ *org.apache.tuscany.spi.model.DataType,Map)
*/
@SuppressWarnings("unchecked")
public Object mediate(Object source,
@@ -88,10 +88,10 @@
// the source and target type
if (transformer instanceof PullTransformer) {
// For intermediate node, set data type to null
- result = ((PullTransformer)transformer).transform(result, context);
+ result = ((PullTransformer) transformer).transform(result, context);
} else if (transformer instanceof PushTransformer) {
- DataPipe dataPipe = (i < size - 1) ? (DataPipe)path.get(++i) : null;
- ((PushTransformer)transformer).transform(result, dataPipe.getSink(), context);
+ DataPipe dataPipe = (i < size - 1) ? (DataPipe) path.get(++i) : null;
+ ((PushTransformer) transformer).transform(result, dataPipe.getSink(), context);
result = dataPipe.getResult();
}
i++;
@@ -108,10 +108,10 @@
Map<Class<?>, Object> metadata) {
DataType sourceType =
(index == 0) ? sourceDataType : new DataType<Object>(transformer.getSourceDataBinding(),
- Object.class, null);
+ Object.class, null);
DataType targetType =
(index == size - 1) ? targetDataType : new DataType<Object>(transformer.getTargetDataBinding(),
- Object.class, null);
+ Object.class, null);
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
TransformationContext context =
new TransformationContextImpl(sourceType, targetType, classLoader, metadata);
@@ -146,11 +146,11 @@
createTransformationContext(sourceDataType, targetDataType, size, i, transformer, metadata);
if (transformer instanceof PullTransformer) {
- result = ((PullTransformer)transformer).transform(result, context);
+ result = ((PullTransformer) transformer).transform(result, context);
} else if (transformer instanceof PushTransformer) {
- DataPipe dataPipe = (i < size - 1) ? (DataPipe)path.get(++i) : null;
+ DataPipe dataPipe = (i < size - 1) ? (DataPipe) path.get(++i) : null;
Object sink = dataPipe != null ? dataPipe.getSink() : target;
- ((PushTransformer)transformer).transform(result, sink, context);
+ ((PushTransformer) transformer).transform(result, sink, context);
result = (dataPipe != null) ? dataPipe.getResult() : null;
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Output2OutputTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Output2OutputTransformer.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Output2OutputTransformer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Output2OutputTransformer.java Wed Feb 28 11:31:59 2007
@@ -20,10 +20,11 @@
package org.apache.tuscany.core.databinding.impl;
import java.util.List;
-
import javax.xml.namespace.QName;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
import org.apache.tuscany.spi.databinding.DataBinding;
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
import org.apache.tuscany.spi.databinding.Mediator;
@@ -34,14 +35,12 @@
import org.apache.tuscany.spi.databinding.WrapperHandler;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
import org.apache.tuscany.spi.idl.ElementInfo;
-import org.apache.tuscany.spi.model.WrapperInfo;
import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.spi.model.Operation;
-import org.osoa.sca.annotations.Service;
+import org.apache.tuscany.spi.model.WrapperInfo;
/**
- * This is a special transformer to transform the output from one IDL to the
- * other one
+ * This is a special transformer to transform the output from one IDL to the other one
*/
@Service(Transformer.class)
public class Output2OutputTransformer extends TransformerExtension<Object, Object> implements
@@ -53,7 +52,7 @@
protected Mediator mediator;
/**
- * @param wrapperHandler
+ *
*/
public Output2OutputTransformer() {
super();
@@ -62,7 +61,7 @@
/**
* @param mediator the mediator to set
*/
- @Autowire
+ @Reference
public void setMediator(Mediator mediator) {
this.mediator = mediator;
}
@@ -70,7 +69,7 @@
/**
* @param dataBindingRegistry the dataBindingRegistry to set
*/
- @Autowire
+ @Reference
public void setDataBindingRegistry(DataBindingRegistry dataBindingRegistry) {
this.dataBindingRegistry = dataBindingRegistry;
}
@@ -115,7 +114,7 @@
WrapperHandler wrapperHandler = dataBinding == null ? null : dataBinding.getWrapperHandler();
if (wrapperHandler == null) {
throw new TransformationException(
- "No wrapper handler is provided for databinding: " + dataBindingId);
+ "No wrapper handler is provided for databinding: " + dataBindingId);
}
return wrapperHandler;
}
@@ -129,7 +128,7 @@
public Object transform(Object response, TransformationContext context) {
try {
DataType<DataType> sourceType = context.getSourceDataType();
- Operation<?> sourceOp = (Operation<?>)sourceType.getOperation();
+ Operation<?> sourceOp = (Operation<?>) sourceType.getOperation();
boolean sourceWrapped = sourceOp != null && sourceOp.isWrapperStyle();
WrapperHandler sourceWrapperHandler = null;
if (sourceWrapped) {
@@ -137,7 +136,7 @@
}
DataType<DataType> targetType = context.getTargetDataType();
- Operation<?> targetOp = (Operation<?>)targetType.getOperation();
+ Operation<?> targetOp = (Operation<?>) targetType.getOperation();
boolean targetWrapped = targetOp != null && targetOp.isWrapperStyle();
WrapperHandler targetWrapperHandler = null;
if (targetWrapped) {
@@ -178,7 +177,7 @@
// targetWrapperHandler.create(wrapperElement, context);
DataType<QName> targetWrapperType =
new DataType<QName>(targetType.getLogical().getDataBinding(), Object.class,
- wrapperElement.getQName());
+ wrapperElement.getQName());
Object targetWrapper =
mediator.mediate(sourceWrapper, sourceType.getLogical(), targetWrapperType, context
.getMetadata());
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java Wed Feb 28 11:31:59 2007
@@ -19,7 +19,8 @@
package org.apache.tuscany.core.databinding.impl;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
import org.apache.tuscany.spi.wire.Wire;
import org.apache.tuscany.spi.wire.WirePostProcessorExtension;
@@ -42,7 +43,7 @@
/**
* @param dataBindingRegistry the dataBindingRegistry to set
*/
- @Autowire
+ @Reference
public void setDataBindingRegistry(DataBindingRegistry dataBindingRegistry) {
// this.dataBindingRegistry = dataBindingRegistry;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java Wed Feb 28 11:31:59 2007
@@ -21,7 +21,8 @@
import java.util.Collection;
import javax.xml.stream.XMLInputFactory;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.builder.Builder;
import org.apache.tuscany.spi.builder.BuilderException;
import org.apache.tuscany.spi.builder.BuilderInstantiationException;
@@ -81,12 +82,12 @@
xmlFactory = XMLInputFactory.newInstance("javax.xml.stream.XMLInputFactory", getClass().getClassLoader());
}
- @Autowire
+ @Reference
public void setLoader(LoaderRegistry loader) {
this.loader = loader;
}
- @Autowire
+ @Reference
public void setBuilder(BuilderRegistry builder) {
this.builder = builder;
}
@@ -96,17 +97,17 @@
this.monitor = monitor;
}
- @Autowire
+ @Reference
public void setResolver(AutowireResolver resolver) {
this.resolver = resolver;
}
- @Autowire
+ @Reference
public void setConnector(Connector connector) {
this.connector = connector;
}
- @Autowire
+ @Reference
public void setComponentManager(ComponentManager componentManager) {
this.componentManager = componentManager;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java Wed Feb 28 11:31:59 2007
@@ -27,8 +27,8 @@
import static org.osoa.sca.Constants.SCA_NS;
import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
@@ -52,8 +52,8 @@
private final JavaInterfaceProcessorRegistry interfaceRegsitry;
@Constructor({"registry", "interfaceRegsitry"})
- public InterfaceJavaLoader(@Autowire LoaderRegistry registry,
- @Autowire JavaInterfaceProcessorRegistry interfaceRegistry) {
+ public InterfaceJavaLoader(@Reference LoaderRegistry registry,
+ @Reference JavaInterfaceProcessorRegistry interfaceRegistry) {
super(registry);
this.interfaceRegsitry = interfaceRegistry;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java Wed Feb 28 11:31:59 2007
@@ -29,8 +29,8 @@
import javax.xml.stream.XMLStreamReader;
import static org.osoa.sca.Constants.SCA_NS;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.CompositeClassLoader;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
@@ -65,7 +65,7 @@
private final ArtifactRepository artifactRepository;
- public CompositeLoader(@Autowire LoaderRegistry registry, @Autowire ArtifactRepository artifactRepository) {
+ public CompositeLoader(@Reference LoaderRegistry registry, @Reference ArtifactRepository artifactRepository) {
super(registry);
this.artifactRepository = artifactRepository;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoader.java Wed Feb 28 11:31:59 2007
@@ -26,8 +26,8 @@
import javax.xml.stream.XMLStreamReader;
import org.osoa.sca.Constants;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.CompositeClassLoader;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
@@ -52,8 +52,8 @@
private final ArtifactRepository artifactRepository;
- public ImplementationCompositeLoader(@Autowire LoaderRegistry registry,
- @Autowire ArtifactRepository artifactRepository) {
+ public ImplementationCompositeLoader(@Reference LoaderRegistry registry,
+ @Reference ArtifactRepository artifactRepository) {
super(registry);
this.artifactRepository = artifactRepository;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemCompositeBuilder.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemCompositeBuilder.java Wed Feb 28 11:31:59 2007
@@ -21,8 +21,8 @@
import java.net.URI;
import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.BuilderException;
import org.apache.tuscany.spi.builder.BuilderRegistry;
import org.apache.tuscany.spi.component.Component;
@@ -40,7 +40,7 @@
public class SystemCompositeBuilder extends AbstractCompositeBuilder<SystemCompositeImplementation> {
@Constructor
- public SystemCompositeBuilder(@Autowire BuilderRegistry builderRegistry) {
+ public SystemCompositeBuilder(@Reference BuilderRegistry builderRegistry) {
this.builderRegistry = builderRegistry;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentTypeLoader.java Wed Feb 28 11:31:59 2007
@@ -21,8 +21,8 @@
import java.net.URL;
import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentTypeLoaderExtension;
import org.apache.tuscany.spi.implementation.java.IntrospectionRegistry;
@@ -44,8 +44,8 @@
private Introspector introspector;
@Constructor({"registry", "introspector"})
- public JavaComponentTypeLoader(@Autowire LoaderRegistry loaderRegistry,
- @Autowire IntrospectionRegistry introspector) {
+ public JavaComponentTypeLoader(@Reference LoaderRegistry loaderRegistry,
+ @Reference IntrospectionRegistry introspector) {
super(loaderRegistry);
this.introspector = introspector;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementationLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementationLoader.java Wed Feb 28 11:31:59 2007
@@ -24,8 +24,8 @@
import static org.osoa.sca.Constants.SCA_NS;
import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -36,8 +36,8 @@
public class JavaImplementationLoader extends LoaderExtension {
public static final QName IMPLEMENTATION_JAVA = new QName(SCA_NS, "implementation.java");
- @Constructor({"registry"})
- public JavaImplementationLoader(@Autowire LoaderRegistry registry) {
+ @Constructor
+ public JavaImplementationLoader(@Reference LoaderRegistry registry) {
super(registry);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessor.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessor.java Wed Feb 28 11:31:59 2007
@@ -22,7 +22,8 @@
import java.lang.reflect.Constructor;
import java.util.List;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
import org.apache.tuscany.spi.implementation.java.ImplementationProcessorExtension;
@@ -44,7 +45,7 @@
private ImplementationProcessorService service;
- public ConstructorProcessor(@Autowire ImplementationProcessorService service) {
+ public ConstructorProcessor(@Reference ImplementationProcessorService service) {
this.service = service;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java Wed Feb 28 11:31:59 2007
@@ -24,8 +24,8 @@
import org.osoa.sca.ComponentContext;
import org.osoa.sca.RequestContext;
import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.ImplementationProcessorExtension;
@@ -48,7 +48,7 @@
public class ContextProcessor extends ImplementationProcessorExtension {
private WorkContext workContext;
- @Autowire
+ @Reference
public void setWorkContext(WorkContext workContext) {
this.workContext = workContext;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java Wed Feb 28 11:31:59 2007
@@ -32,10 +32,10 @@
import java.util.Map;
import java.util.Set;
+import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Remotable;
import org.osoa.sca.annotations.Service;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.databinding.extension.SimpleTypeMapperExtension;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
@@ -70,7 +70,7 @@
private SimpleTypeMapperExtension typeMapper = new SimpleTypeMapperExtension();
private ImplementationProcessorService implService;
- public HeuristicPojoProcessor(@Autowire ImplementationProcessorService service) {
+ public HeuristicPojoProcessor(@Reference ImplementationProcessorService service) {
this.implService = service;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java Wed Feb 28 11:31:59 2007
@@ -59,7 +59,7 @@
private JavaInterfaceProcessorRegistry registry;
private SimpleTypeMapperExtension typeMapper = new SimpleTypeMapperExtension();
- public ImplementationProcessorServiceImpl(@Autowire JavaInterfaceProcessorRegistry registry) {
+ public ImplementationProcessorServiceImpl(@Reference JavaInterfaceProcessorRegistry registry) {
this.registry = registry;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/MonitorProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/MonitorProcessor.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/MonitorProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/MonitorProcessor.java Wed Feb 28 11:31:59 2007
@@ -18,7 +18,8 @@
*/
package org.apache.tuscany.core.implementation.processor;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.AbstractPropertyProcessor;
import org.apache.tuscany.spi.implementation.java.ImplementationProcessorService;
@@ -37,9 +38,9 @@
public class MonitorProcessor extends AbstractPropertyProcessor<Monitor> {
private MonitorFactory monitorFactory;
- public MonitorProcessor(@Autowire MonitorFactory monitorFactory, @Autowire ImplementationProcessorService service) {
+ public MonitorProcessor(@Reference MonitorFactory factory, @Reference ImplementationProcessorService service) {
super(Monitor.class, service);
- this.monitorFactory = monitorFactory;
+ this.monitorFactory = factory;
}
protected String getName(Monitor annotation) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/PropertyProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/PropertyProcessor.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/PropertyProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/PropertyProcessor.java Wed Feb 28 11:31:59 2007
@@ -21,8 +21,8 @@
import java.lang.reflect.Constructor;
import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.databinding.extension.SimpleTypeMapperExtension;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.idl.TypeInfo;
@@ -42,7 +42,7 @@
public class PropertyProcessor extends AbstractPropertyProcessor<Property> {
private SimpleTypeMapperExtension typeMapper = new SimpleTypeMapperExtension();
- public PropertyProcessor(@Autowire ImplementationProcessorService service) {
+ public PropertyProcessor(@Reference ImplementationProcessorService service) {
super(Property.class, service);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ServiceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ServiceProcessor.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ServiceProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ServiceProcessor.java Wed Feb 28 11:31:59 2007
@@ -23,9 +23,9 @@
import java.util.Set;
import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Remotable;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
import org.apache.tuscany.spi.implementation.java.ImplementationProcessorExtension;
@@ -50,7 +50,7 @@
private ImplementationProcessorService implService;
- public ServiceProcessor(@Autowire ImplementationProcessorService implService) {
+ public ServiceProcessor(@Reference ImplementationProcessorService implService) {
this.implService = implService;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java Wed Feb 28 11:31:59 2007
@@ -24,8 +24,9 @@
import java.util.Collection;
import java.util.Map;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -59,7 +60,7 @@
return SystemImplementation.class;
}
- @Autowire
+ @Reference
public void setHost(ResourceHost host) {
this.host = host;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemComponentTypeLoader.java Wed Feb 28 11:31:59 2007
@@ -20,7 +20,8 @@
import java.net.URL;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentTypeLoaderExtension;
import org.apache.tuscany.spi.implementation.java.IntrospectionRegistry;
@@ -57,8 +58,7 @@
this.introspector = introspector;
}
- //FIXME autowire to support multiple interfaces
- @Autowire
+ @Reference
public void setIntrospector(IntrospectionRegistry introspector) {
this.introspector = introspector;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemImplementationLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/loader/SystemImplementationLoader.java Wed Feb 28 11:31:59 2007
@@ -23,7 +23,8 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -43,7 +44,7 @@
public static final QName SYSTEM_IMPLEMENTATION =
new QName("http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT", "implementation.system");
- public SystemImplementationLoader(@Autowire LoaderRegistry registry) {
+ public SystemImplementationLoader(@Reference LoaderRegistry registry) {
super(registry);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java Wed Feb 28 11:31:59 2007
@@ -26,8 +26,8 @@
import static org.osoa.sca.Constants.SCA_NS;
import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -45,7 +45,7 @@
public static final QName COMPONENT_TYPE = new QName(SCA_NS, "componentType");
@Constructor
- public ComponentTypeElementLoader(@Autowire LoaderRegistry registry) {
+ public ComponentTypeElementLoader(@Reference LoaderRegistry registry) {
super(registry);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/DependencyLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/DependencyLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/DependencyLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/DependencyLoader.java Wed Feb 28 11:31:59 2007
@@ -23,7 +23,8 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -48,7 +49,7 @@
private static final QName CLASSIFIER = new QName(NS, "classifier");
private static final QName TYPE = new QName(NS, "type");
- public DependencyLoader(@Autowire LoaderRegistry registry) {
+ public DependencyLoader(@Reference LoaderRegistry registry) {
super(registry);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/IncludeLoader.java Wed Feb 28 11:31:59 2007
@@ -27,8 +27,8 @@
import static org.osoa.sca.Constants.SCA_NS;
import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -50,8 +50,8 @@
public class IncludeLoader extends LoaderExtension<Include> {
private static final QName INCLUDE = new QName(SCA_NS, "include");
- @Constructor({"registry"})
- public IncludeLoader(@Autowire LoaderRegistry registry) {
+ @Constructor
+ public IncludeLoader(@Reference LoaderRegistry registry) {
super(registry);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderExceptionFormatter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderExceptionFormatter.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderExceptionFormatter.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderExceptionFormatter.java Wed Feb 28 11:31:59 2007
@@ -4,8 +4,8 @@
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.host.monitor.ExceptionFormatter;
@@ -20,7 +20,7 @@
public class LoaderExceptionFormatter implements ExceptionFormatter {
private FormatterRegistry factory;
- public LoaderExceptionFormatter(@Autowire FormatterRegistry factory) {
+ public LoaderExceptionFormatter(@Reference FormatterRegistry factory) {
this.factory = factory;
factory.register(this);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PolicySetLoader.java Wed Feb 28 11:31:59 2007
@@ -28,8 +28,8 @@
import static org.osoa.sca.Constants.SCA_NS;
import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -61,8 +61,8 @@
private static final QName WSPOLICYATTACHMENT = new QName(WSPOLICY_NAMESPACE, "PolicyAttachment");
- @Constructor({"registry"})
- public PolicySetLoader(@Autowire LoaderRegistry registry) {
+ @Constructor
+ public PolicySetLoader(@Reference LoaderRegistry registry) {
super(registry);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java Wed Feb 28 11:31:59 2007
@@ -28,8 +28,8 @@
import org.w3c.dom.Document;
import static org.osoa.sca.Constants.SCA_NS;
import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -52,8 +52,8 @@
public static final QName PROPERTY = new QName(SCA_NS, "property");
private final DocumentBuilder documentBuilder;
- @Constructor({"registry"})
- public PropertyLoader(@Autowire LoaderRegistry registry) {
+ @Constructor
+ public PropertyLoader(@Reference LoaderRegistry registry) {
super(registry);
try {
documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java Wed Feb 28 11:31:59 2007
@@ -26,8 +26,8 @@
import static org.osoa.sca.Constants.SCA_NS;
import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -49,7 +49,7 @@
public static final QName REFERENCE = new QName(SCA_NS, "reference");
@Constructor
- public ReferenceLoader(@Autowire LoaderRegistry registry) {
+ public ReferenceLoader(@Reference LoaderRegistry registry) {
super(registry);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java Wed Feb 28 11:31:59 2007
@@ -27,9 +27,9 @@
import static org.osoa.sca.Constants.SCA_NS;
import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -49,7 +49,7 @@
private static final QName SERVICE = new QName(SCA_NS, "service");
@Constructor
- public ServiceLoader(@Autowire LoaderRegistry registry) {
+ public ServiceLoader(@Reference LoaderRegistry registry) {
super(registry);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java Wed Feb 28 11:31:59 2007
@@ -28,9 +28,9 @@
import static org.osoa.sca.Constants.SCA_NS;
import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.InvalidWireException;
@@ -50,7 +50,7 @@
private static final QName TARGET_URI = new QName(SCA_NS, "target.uri");
@Constructor
- public WireLoader(@Autowire LoaderRegistry registry) {
+ public WireLoader(@Reference LoaderRegistry registry) {
super(registry);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/AbstractMarshallerExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/AbstractMarshallerExtension.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/AbstractMarshallerExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/AbstractMarshallerExtension.java Wed Feb 28 11:31:59 2007
@@ -20,7 +20,8 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.marshaller.ModelMarshaller;
import org.apache.tuscany.spi.marshaller.ModelMarshallerRegistry;
import org.apache.tuscany.spi.model.ModelObject;
@@ -29,31 +30,34 @@
// Private Model marshaller registry
protected ModelMarshallerRegistry registry;
-
+
/**
* Injects the model marshaller registry.
+ *
* @param registry Model marshaller registry.
*/
- @Autowire
+ @Reference
public void setRegistry(ModelMarshallerRegistry registry) {
-
+
this.registry = registry;
-
+
Class<MD> marshallerType = getModelObjectType();
QName marshallerQName = getModelObjectQName();
-
+
registry.registerMarshaller(marshallerType, marshallerQName, this);
-
+
}
-
+
/**
* Gets the qualified name of the XML fragment for the marshalled model object.
+ *
* @return Qualified name of the XML fragment.
*/
protected abstract QName getModelObjectQName();
-
+
/**
* Retursn the type of the model object.
+ *
* @return Model object type.
*/
protected abstract Class<MD> getModelObjectType();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyObjectFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyObjectFactoryImpl.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyObjectFactoryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyObjectFactoryImpl.java Wed Feb 28 11:31:59 2007
@@ -21,10 +21,14 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.core.databinding.xml.DOMDataBinding;
+import org.w3c.dom.Node;
+import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.databinding.DataBinding;
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
import org.apache.tuscany.spi.databinding.Mediator;
@@ -35,10 +39,8 @@
import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.spi.model.Property;
import org.apache.tuscany.spi.model.PropertyValue;
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-import org.w3c.dom.Node;
+
+import org.apache.tuscany.core.databinding.xml.DOMDataBinding;
@Service(PropertyObjectFactory.class)
@Scope("COMPOSITE")
@@ -49,8 +51,8 @@
public PropertyObjectFactoryImpl() {
}
- @Constructor({"registry", "mediator"})
- public PropertyObjectFactoryImpl(@Autowire DataBindingRegistry registry, @Autowire Mediator mediator) {
+ @Constructor
+ public PropertyObjectFactoryImpl(@Reference DataBindingRegistry registry, @Reference Mediator mediator) {
super();
this.registry = registry;
this.mediator = mediator;
@@ -75,7 +77,7 @@
sourceDataType = new DataType<QName>(DOMDataBinding.NAME, Node.class, this.property.getXmlType());
TypeInfo typeInfo = null;
if (this.property.getXmlType() != null) {
- if (SimpleTypeMapperExtension.isSimpleXSDType(this.property.getXmlType())) {
+ if (SimpleTypeMapperExtension.isSimpleXSDType(this.property.getXmlType())) {
typeInfo = new TypeInfo(property.getXmlType(), true, null);
} else {
typeInfo = new TypeInfo(property.getXmlType(), false, null);
@@ -83,11 +85,11 @@
} else {
typeInfo = new TypeInfo(property.getXmlType(), false, null);
}
-
+
ElementInfo elementInfo = new ElementInfo(null, typeInfo);
sourceDataType.setMetadata(ElementInfo.class.getName(), elementInfo);
Class javaType = this.property.getJavaType();
- String dataBinding = (String)property.getExtensions().get(DataBinding.class.getName());
+ String dataBinding = (String) property.getExtensions().get(DataBinding.class.getName());
if (dataBinding != null) {
targetDataType = new DataType<Class>(dataBinding, javaType, javaType);
} else {
@@ -100,7 +102,7 @@
@SuppressWarnings("unchecked")
public P getInstance() throws ObjectCreationException {
- return (P)mediator.mediate(propertyValue.getValue(), sourceDataType, targetDataType, null);
+ return (P) mediator.mediate(propertyValue.getValue(), sourceDataType, targetDataType, null);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionDirectoryWatcher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionDirectoryWatcher.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionDirectoryWatcher.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionDirectoryWatcher.java Wed Feb 28 11:31:59 2007
@@ -25,8 +25,7 @@
import org.osoa.sca.annotations.EagerInit;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Property;
-
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
import org.apache.tuscany.host.deployment.ContributionService;
import org.apache.tuscany.host.deployment.DeploymentException;
@@ -36,7 +35,7 @@
private final String path;
private final ContributionService contributionService;
- public ContributionDirectoryWatcher(@Autowire ContributionService contributionService,
+ public ContributionDirectoryWatcher(@Reference ContributionService contributionService,
@Property(name = "path")String path) {
this.path = path;
this.contributionService = contributionService;
@@ -53,7 +52,7 @@
File[] files = extensionDir.listFiles();
for (File file : files) {
try {
- if(file.isDirectory())
+ if (file.isDirectory())
this.contributionService.contribute(file.toURL(), false);
else
this.contributionService.contribute(file.toURL(), true);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionProcessorRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionProcessorRegistryImpl.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionProcessorRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionProcessorRegistryImpl.java Wed Feb 28 11:31:59 2007
@@ -26,19 +26,21 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.tuscany.host.deployment.DeploymentException;
-import org.apache.tuscany.host.deployment.UnsupportedContentTypeException;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
import org.apache.tuscany.spi.deployer.ContentTypeDescriber;
import org.apache.tuscany.spi.deployer.ContributionProcessor;
import org.apache.tuscany.spi.deployer.ContributionProcessorRegistry;
import org.apache.tuscany.spi.model.Contribution;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Service;
+
+import org.apache.tuscany.host.deployment.DeploymentException;
+import org.apache.tuscany.host.deployment.UnsupportedContentTypeException;
/**
* Default implementation of ContributionProcessorRegistry
- *
+ *
* @version $Rev$ $Date$
*/
@EagerInit
@@ -49,11 +51,11 @@
*/
private Map<String, ContributionProcessor> registry = new HashMap<String, ContributionProcessor>();
/**
- * Helper method to describe contentType for each artifact
+ * Helper method to describe contentType for each artifact
*/
private ContentTypeDescriber contentTypeDescriber;
- public ContributionProcessorRegistryImpl(@Autowire ContentTypeDescriber contentTypeDescriber) {
+ public ContributionProcessorRegistryImpl(@Reference ContentTypeDescriber contentTypeDescriber) {
if (contentTypeDescriber == null) {
this.contentTypeDescriber = new ContentTypeDescriberImpl();
} else {
@@ -71,7 +73,7 @@
public void processContent(Contribution contribution, URI source, InputStream inputStream)
throws DeploymentException, IOException {
-
+
URL locationURL = contribution.getArtifact(source).getLocation();
String contentType = this.contentTypeDescriber.getContentType(locationURL, null);
if (contentType == null) {
@@ -88,6 +90,6 @@
}
public void processModel(Contribution contribution, URI source, Object modelObject) throws DeploymentException,
- IOException {
+ IOException {
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java?view=diff&rev=512917&r1=512916&r2=512917
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java Wed Feb 28 11:31:59 2007
@@ -27,14 +27,16 @@
import java.util.Map;
import java.util.UUID;
-import org.apache.tuscany.core.util.IOHelper;
-import org.apache.tuscany.host.deployment.ContributionService;
-import org.apache.tuscany.host.deployment.DeploymentException;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.deployer.ContributionProcessorRegistry;
import org.apache.tuscany.spi.deployer.ContributionRepository;
import org.apache.tuscany.spi.model.Contribution;
+import org.apache.tuscany.core.util.IOHelper;
+import org.apache.tuscany.host.deployment.ContributionService;
+import org.apache.tuscany.host.deployment.DeploymentException;
+
/**
* @version $Rev$ $Date$
*/
@@ -48,14 +50,12 @@
*/
protected ContributionProcessorRegistry processorRegistry;
/**
- * Contribution registry
- * This is a registry of processed Contributios index by URI
+ * Contribution registry This is a registry of processed Contributios index by URI
*/
protected Map<URI, Contribution> contributionRegistry = new HashMap<URI, Contribution>();
- public ContributionServiceImpl(@Autowire
- ContributionRepository repository, @Autowire
- ContributionProcessorRegistry processorRegistry) {
+ public ContributionServiceImpl(@Reference ContributionRepository repository,
+ @Reference ContributionProcessorRegistry processorRegistry) {
super();
this.contributionRepository = repository;
this.processorRegistry = processorRegistry;
@@ -81,7 +81,8 @@
}
}
- public URI contribute(URI source, InputStream contributionStream, boolean storeInRepository) throws DeploymentException, IOException {
+ public URI contribute(URI source, InputStream contributionStream, boolean storeInRepository)
+ throws DeploymentException, IOException {
if (source == null) {
throw new IllegalArgumentException("source URI for contribution is null");
}
@@ -93,13 +94,13 @@
// store the contribution in the contribution repository
URI contributionURI = URI.create("sca://contribution/" + UUID.randomUUID());
URL locationURL;
- if(storeInRepository){
+ if (storeInRepository) {
locationURL = this.contributionRepository.store(source, contributionStream);
- }else{
+ } else {
locationURL = source.toURL();
}
-
-
+
+
Contribution contribution = null;
contribution = new Contribution(contributionURI);
contribution.setLocation(locationURL);
@@ -109,7 +110,7 @@
//store the contribution on the registry
this.contributionRegistry.put(contribution.getUri(), contribution);
-
+
return contribution.getUri();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org