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/01 01:21:08 UTC
svn commit: r502058 - in
/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer:
DeployerImpl.java federation/FederatedDeployer.java
Author: meerajk
Date: Wed Jan 31 16:21:08 2007
New Revision: 502058
URL: http://svn.apache.org/viewvc?view=rev&rev=502058
Log:
Changed to use the marshaller instead of the loader.
Modified:
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/deployer/federation/FederatedDeployer.java
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=502058&r1=502057&r2=502058
==============================================================================
--- 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 Jan 31 16:21:08 2007
@@ -53,7 +53,7 @@
*/
public class DeployerImpl implements Deployer {
protected XMLInputFactory xmlFactory;
- protected Loader loader;
+ private Loader loader;
protected Builder builder;
protected ScopeContainerMonitor monitor;
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=502058&r1=502057&r2=502058
==============================================================================
--- 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 Wed Jan 31 16:21:08 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.core.deployer.federation;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
@@ -32,8 +31,11 @@
import org.apache.tuscany.spi.component.PrepareException;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.loader.LoaderException;
+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;
@@ -49,6 +51,18 @@
/** 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;
+ }
+
/**
* Deploys the component.
* @param content SCDL content.
@@ -67,16 +81,17 @@
final DeploymentContext deploymentContext = new RootDeploymentContext(null, xmlFactory, scopeContainer, null);
try {
- final ComponentDefinition<?> definition =
- (ComponentDefinition<?>) loader.load(parent, null, content, deploymentContext);
+
+ final ModelMarshaller<? extends ModelObject> marshaller = marshallerRegistry.getMarshaller(MESSAGE_TYPE);
+ final ComponentDefinition<?> definition = (ComponentDefinition<?>) marshaller.unmarshall(content, false);
final Component component = (Component) builder.build(parent, definition, deploymentContext);
+
component.prepare();
component.start();
- } catch (LoaderException ex) {
+
+ } catch (MarshalException ex) {
return null;
} catch (BuilderException ex) {
- return null;
- } catch (XMLStreamException ex) {
return null;
} catch (PrepareException ex) {
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org