You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sv...@apache.org on 2007/06/25 08:48:09 UTC
svn commit: r550383 -
/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
Author: svkrish
Date: Sun Jun 24 23:48:08 2007
New Revision: 550383
URL: http://svn.apache.org/viewvc?view=rev&rev=550383
Log:
undoing halfbaked commits and merging back with r550353
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java?view=diff&rev=550383&r1=550382&r2=550383
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java Sun Jun 24 23:48:08 2007
@@ -47,8 +47,6 @@
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.assembly.Wire;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.DeployedArtifact;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
@@ -66,9 +64,6 @@
*/
public class CompositeProcessor extends BaseArtifactProcessor implements StAXArtifactProcessor<Composite> {
- private ContributionFactory contributionFactory;
- private DeployedArtifact deployedArtifact;
-
/**
* Construct a new composite processor
* @param assemblyFactory
@@ -77,9 +72,8 @@
*/
public CompositeProcessor(AssemblyFactory factory, PolicyFactory policyFactory,
InterfaceContractMapper interfaceContractMapper,
- StAXArtifactProcessor extensionProcessor, ContributionFactory contributionFactory) {
+ StAXArtifactProcessor extensionProcessor) {
super(factory, policyFactory, extensionProcessor);
- this.contributionFactory = contributionFactory;
}
public Composite read(XMLStreamReader reader) throws ContributionReadException {
@@ -181,10 +175,6 @@
property = componentProperty;
componentProperty.setSource(getString(reader, SOURCE));
componentProperty.setFile(getString(reader, FILE));
- if ( componentProperty.getFile() != null) {
- deployedArtifact = contributionFactory.createDeployedArtifact();
- deployedArtifact.setURI(componentProperty.getFile());
- }
readPolicies(property, reader);
readProperty(componentProperty, reader);
component.getProperties().add(componentProperty);
@@ -446,8 +436,6 @@
ConstrainingType constrainingType = composite.getConstrainingType();
constrainingType = resolver.resolveModel(ConstrainingType.class, constrainingType);
composite.setConstrainingType(constrainingType);
-
- Object obj = resolver.resolveModel(DeployedArtifact.class, deployedArtifact);
// Resolve includes in the composite
for (int i = 0, n = composite.getIncludes().size(); i < n; i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org