Author: rhauch Date: 2009-10-27 15:12:46 -0400 (Tue, 27 Oct 2009) New Revision: 1310 Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/ForkRequestProcessor.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/JoinMirrorRequestProcessor.java Log: DNA-457 Added support for the new LockBranchRequest and UnlockBranchRequest classes in the federation connector. Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/ForkRequestProcessor.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/ForkRequestProcessor.java 2009-10-27 16:37:53 UTC (rev 1309) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/ForkRequestProcessor.java 2009-10-27 19:12:46 UTC (rev 1310) @@ -66,18 +66,23 @@ import org.jboss.dna.graph.request.GetWorkspacesRequest; import org.jboss.dna.graph.request.InvalidRequestException; import org.jboss.dna.graph.request.InvalidWorkspaceException; +import org.jboss.dna.graph.request.LockBranchRequest; import org.jboss.dna.graph.request.MoveBranchRequest; import org.jboss.dna.graph.request.ReadAllChildrenRequest; import org.jboss.dna.graph.request.ReadAllPropertiesRequest; +import org.jboss.dna.graph.request.ReadBlockOfChildrenRequest; import org.jboss.dna.graph.request.ReadBranchRequest; +import org.jboss.dna.graph.request.ReadNextBlockOfChildrenRequest; import org.jboss.dna.graph.request.ReadNodeRequest; import org.jboss.dna.graph.request.ReadPropertyRequest; import org.jboss.dna.graph.request.RemovePropertyRequest; import org.jboss.dna.graph.request.RenameNodeRequest; import org.jboss.dna.graph.request.Request; import org.jboss.dna.graph.request.SetPropertyRequest; +import org.jboss.dna.graph.request.UnlockBranchRequest; import org.jboss.dna.graph.request.UnsupportedRequestException; import org.jboss.dna.graph.request.UpdatePropertiesRequest; +import org.jboss.dna.graph.request.UpdateValuesRequest; import org.jboss.dna.graph.request.VerifyNodeExistsRequest; import org.jboss.dna.graph.request.VerifyWorkspaceRequest; import org.jboss.dna.graph.request.processor.RequestProcessor; @@ -839,6 +844,26 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.ReadBlockOfChildrenRequest) + */ + @Override + public void process( ReadBlockOfChildrenRequest request ) { + super.process(request); + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.ReadNextBlockOfChildrenRequest) + */ + @Override + public void process( ReadNextBlockOfChildrenRequest request ) { + super.process(request); + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.ReadAllPropertiesRequest) */ @Override @@ -1129,6 +1154,42 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.UpdateValuesRequest) + */ + @Override + public void process( UpdateValuesRequest request ) { + // Figure out where this request is projected ... + ProjectedNode projectedNode = project(request.on(), request.inWorkspace(), request, true); + if (projectedNode == null) return; + + // Create the federated request ... + FederatedRequest federatedRequest = new FederatedRequest(request); + + // Any non-read request should be submitted to the first ProxyNode ... + while (projectedNode != null) { + if (projectedNode.isProxy()) { + ProxyNode proxy = projectedNode.asProxy(); + // Create and submit a request for the projection ... + UpdateValuesRequest pushDownRequest = new UpdateValuesRequest(proxy.workspaceName(), proxy.location(), + request.property(), request.addedValues(), + request.removedValues()); + federatedRequest.add(pushDownRequest, proxy.isSameLocationAsOriginal(), false, proxy.projection()); + + // Submit the requests for processing and then STOP ... + submit(federatedRequest); + return; + } + assert projectedNode.isPlaceholder(); + projectedNode = projectedNode.next(); + } + // Unable to perform this update ... + String msg = GraphI18n.unableToUpdatePlaceholder.text(readable(request.on()), request.inWorkspace(), getSourceName()); + request.setError(new UnsupportedRequestException(msg)); + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.SetPropertyRequest) */ @Override @@ -1498,6 +1559,75 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.LockBranchRequest) + */ + @Override + public void process( LockBranchRequest request ) { + // Figure out where this request is projected ... + ProjectedNode projectedNode = project(request.at(), request.inWorkspace(), request, true); + if (projectedNode == null) return; + + // Create the federated request ... + FederatedRequest federatedRequest = new FederatedRequest(request); + + // Any non-read request should be submitted to the first ProxyNode ... + while (projectedNode != null) { + if (projectedNode.isProxy()) { + ProxyNode proxy = projectedNode.asProxy(); + // Create and submit a request for the projection ... + LockBranchRequest pushDownRequest = new LockBranchRequest(proxy.location(), proxy.workspaceName(), + request.lockScope(), request.lockTimeoutInMillis()); + federatedRequest.add(pushDownRequest, proxy.isSameLocationAsOriginal(), false, proxy.projection()); + + // Submit the requests for processing and then STOP ... + submit(federatedRequest); + return; + } + assert projectedNode.isPlaceholder(); + projectedNode = projectedNode.next(); + } + // Unable to perform this update ... + String msg = GraphI18n.unableToUpdatePlaceholder.text(readable(request.at()), request.inWorkspace(), getSourceName()); + request.setError(new UnsupportedRequestException(msg)); + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.UnlockBranchRequest) + */ + @Override + public void process( UnlockBranchRequest request ) { + // Figure out where this request is projected ... + ProjectedNode projectedNode = project(request.at(), request.inWorkspace(), request, true); + if (projectedNode == null) return; + + // Create the federated request ... + FederatedRequest federatedRequest = new FederatedRequest(request); + + // Any non-read request should be submitted to the first ProxyNode ... + while (projectedNode != null) { + if (projectedNode.isProxy()) { + ProxyNode proxy = projectedNode.asProxy(); + // Create and submit a request for the projection ... + UnlockBranchRequest pushDownRequest = new UnlockBranchRequest(proxy.location(), proxy.workspaceName()); + federatedRequest.add(pushDownRequest, proxy.isSameLocationAsOriginal(), false, proxy.projection()); + + // Submit the requests for processing and then STOP ... + submit(federatedRequest); + return; + } + assert projectedNode.isPlaceholder(); + projectedNode = projectedNode.next(); + } + // Unable to perform this update ... + String msg = GraphI18n.unableToUpdatePlaceholder.text(readable(request.at()), request.inWorkspace(), getSourceName()); + request.setError(new UnsupportedRequestException(msg)); + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.VerifyWorkspaceRequest) */ @Override Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/JoinMirrorRequestProcessor.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/JoinMirrorRequestProcessor.java 2009-10-27 16:37:53 UTC (rev 1309) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/JoinMirrorRequestProcessor.java 2009-10-27 19:12:46 UTC (rev 1310) @@ -39,8 +39,10 @@ import org.jboss.dna.graph.request.CreateNodeRequest; import org.jboss.dna.graph.request.CreateWorkspaceRequest; import org.jboss.dna.graph.request.DeleteBranchRequest; +import org.jboss.dna.graph.request.DeleteChildrenRequest; import org.jboss.dna.graph.request.DestroyWorkspaceRequest; import org.jboss.dna.graph.request.GetWorkspacesRequest; +import org.jboss.dna.graph.request.LockBranchRequest; import org.jboss.dna.graph.request.MoveBranchRequest; import org.jboss.dna.graph.request.ReadAllChildrenRequest; import org.jboss.dna.graph.request.ReadAllPropertiesRequest; @@ -53,7 +55,9 @@ import org.jboss.dna.graph.request.RenameNodeRequest; import org.jboss.dna.graph.request.Request; import org.jboss.dna.graph.request.SetPropertyRequest; +import org.jboss.dna.graph.request.UnlockBranchRequest; import org.jboss.dna.graph.request.UpdatePropertiesRequest; +import org.jboss.dna.graph.request.UpdateValuesRequest; import org.jboss.dna.graph.request.VerifyNodeExistsRequest; import org.jboss.dna.graph.request.VerifyWorkspaceRequest; import org.jboss.dna.graph.request.processor.RequestProcessor; @@ -306,6 +310,20 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.UpdateValuesRequest) + */ + @Override + public void process( UpdateValuesRequest request ) { + UpdateValuesRequest source = (UpdateValuesRequest)federatedRequest.getFirstProjectedRequest().getRequest(); + if (checkErrorOrCancel(request, source)) return; + request.setActualLocation(source.getActualLocationOfNode(), + request.getActualAddedValues(), + request.getActualRemovedValues()); + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.CopyBranchRequest) */ @Override @@ -343,6 +361,18 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.DeleteChildrenRequest) + */ + @Override + public void process( DeleteChildrenRequest request ) { + DeleteChildrenRequest source = (DeleteChildrenRequest)federatedRequest.getFirstProjectedRequest().getRequest(); + if (checkErrorOrCancel(request, source)) return; + request.setActualLocationOfNode(source.getActualLocationOfNode()); + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.MoveBranchRequest) */ @Override @@ -355,6 +385,30 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.LockBranchRequest) + */ + @Override + public void process( LockBranchRequest request ) { + LockBranchRequest source = (LockBranchRequest)federatedRequest.getFirstProjectedRequest().getRequest(); + if (checkErrorOrCancel(request, source)) return; + request.setActualLocation(source.getActualLocation()); + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.UnlockBranchRequest) + */ + @Override + public void process( UnlockBranchRequest request ) { + UnlockBranchRequest source = (UnlockBranchRequest)federatedRequest.getFirstProjectedRequest().getRequest(); + if (checkErrorOrCancel(request, source)) return; + request.setActualLocation(source.getActualLocation()); + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.VerifyWorkspaceRequest) */ @Override