You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/02/02 08:42:58 UTC
svn commit: r502526 -
/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java
Author: meerajk
Date: Thu Feb 1 23:42:56 2007
New Revision: 502526
URL: http://svn.apache.org/viewvc?view=rev&rev=502526
Log:
Removed the registry.
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java?view=diff&rev=502526&r1=502525&r2=502526
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/federation/FederatedDeployer.java Thu Feb 1 23:42:56 2007
@@ -33,9 +33,7 @@
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.marshaller.MarshalException;
import org.apache.tuscany.spi.marshaller.ModelMarshaller;
-import org.apache.tuscany.spi.marshaller.ModelMarshallerRegistry;
import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.ModelObject;
import org.apache.tuscany.spi.services.discovery.DiscoveryService;
import org.apache.tuscany.spi.services.discovery.RequestListener;
@@ -51,17 +49,8 @@
/** QName of the message. */
private static final QName MESSAGE_TYPE = new QName("http://www.osoa.org/xmlns/sca/1.0", "composite");
- /** Marshaller registry. */
- private ModelMarshallerRegistry marshallerRegistry;
-
- /**
- * Injects the model marshaller registry.
- * @param marshallerRegistry Marshaller registry.
- */
- @Autowire
- public void setMarshallerRegistry(ModelMarshallerRegistry marshallerRegistry) {
- this.marshallerRegistry = marshallerRegistry;
- }
+ /** Marshaller. */
+ private ModelMarshaller<ComponentDefinition<?>> marshaller;
/**
* Deploys the component.
@@ -82,8 +71,7 @@
try {
- final ModelMarshaller<? extends ModelObject> marshaller = marshallerRegistry.getMarshaller(MESSAGE_TYPE);
- final ComponentDefinition<?> definition = (ComponentDefinition<?>) marshaller.unmarshall(content, false);
+ final ComponentDefinition<?> definition = marshaller.unmarshall(content, false);
final Component component = (Component) builder.build(parent, definition, deploymentContext);
component.prepare();
@@ -107,6 +95,15 @@
@Autowire
public void setDiscoveryService(DiscoveryService discoveryService) {
discoveryService.registerRequestListener(MESSAGE_TYPE, this);
+ }
+
+ /**
+ * Injects the model marshaller.
+ * @param marshaller Marshaller.
+ */
+ @Autowire
+ public void setMarshaller(ModelMarshaller<ComponentDefinition<?>> marshaller) {
+ this.marshaller = marshaller;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org