Author: rhauch Date: 2008-08-20 15:16:50 -0400 (Wed, 20 Aug 2008) New Revision: 460 Modified: trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/executor/FederatingCommandExecutor.java trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/merge/StandardMergeStrategy.java Log: DNA-188 - Complete the federating command executor http://jira.jboss.com/jira/browse/DNA-188 Removed the identity property passed into the StandardMergeStrategy constructor. Modified: trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/executor/FederatingCommandExecutor.java =================================================================== --- trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/executor/FederatingCommandExecutor.java 2008-08-20 19:15:52 UTC (rev 459) +++ trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/executor/FederatingCommandExecutor.java 2008-08-20 19:16:50 UTC (rev 460) @@ -155,7 +155,7 @@ if (this.sourceProjections.size() == 1 && this.sourceProjections.get(0).isSimple()) { this.mergingStrategy = new OneContributionMergeStrategy(); } else { - this.mergingStrategy = new StandardMergeStrategy(DnaLexicon.UUID); + this.mergingStrategy = new StandardMergeStrategy(); } } assert this.mergingStrategy != null; Modified: trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/merge/StandardMergeStrategy.java =================================================================== --- trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/merge/StandardMergeStrategy.java 2008-08-20 19:15:52 UTC (rev 459) +++ trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/merge/StandardMergeStrategy.java 2008-08-20 19:16:50 UTC (rev 460) @@ -24,20 +24,12 @@ import java.util.List; import org.jboss.dna.connector.federation.contribution.Contribution; import org.jboss.dna.spi.ExecutionContext; -import org.jboss.dna.spi.graph.Name; /** * @author Randall Hauch */ public class StandardMergeStrategy implements MergeStrategy { - private final Name identityPropertyName; - - public StandardMergeStrategy( Name identityPropertyName ) { - assert identityPropertyName != null; - this.identityPropertyName = identityPropertyName; - } - /** * {@inheritDoc} * @@ -49,7 +41,11 @@ ExecutionContext context ) { // Children whose identity properties are the same will be considered to be the same node ... - assert identityPropertyName != null; + + // Assemble the children ... + + // Assemble the properties (and look for UUID property) ... + // Create a merge plan with the contributions ... MergePlan plan = MergePlan.create(contributions); federatedNode.setMergePlan(plan);