[dna-commits] DNA SVN: r922 - in trunk: dna-graph/src/main/java/org/jboss/dna/graph/request and 8 other directories.

Author: rhauch Date: 2009-05-21 18:26:25 -0400 (Thu, 21 May 2009) New Revision: 922 Added: trunk/dna-graph/src/main/java/org/jboss/dna/graph/observe/NetChangeObserver.java Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/ChangeRequest.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CloneWorkspaceRequest.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CopyBranchRequest.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CreateNodeRequest.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CreateWorkspaceRequest.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DeleteBranchRequest.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DeleteChildrenRequest.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DestroyWorkspaceRequest.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/MoveBranchRequest.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/RemovePropertyRequest.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/RenameNodeRequest.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/SetPropertyRequest.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/UpdatePropertiesRequest.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/processor/RequestProcessor.java trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/SessionCache.java trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/Sequencer.java trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/SequencingService.java trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/StreamSequencerAdapter.java trunk/dna-repository/src/test/java/org/jboss/dna/repository/DnaEngineTest.java trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencer/MockSequencerA.java trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencer/MockSequencerB.java trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencer/SequencingServiceTest.java trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencer/StreamSequencerAdapterTest.java trunk/docs/examples/gettingstarted/sequencers/pom.xml trunk/docs/examples/gettingstarted/sequencers/src/main/java/org/jboss/example/dna/sequencer/SequencingClient.java trunk/docs/examples/gettingstarted/sequencers/src/test/java/org/jboss/example/dna/sequencer/SequencingClientTest.java Log: DNA-404 Remove ObservationService, migrate usage to observe RepositoryLibrary Changed the SequencingService to use the new observation framework (by adding an observer to the RepositoryLibrary). This required an observer that computed the net change for a set of change requests, so the NetChangeObserver was added to the observation framework as an abstract subclass of ChangeObserver. Changed the test cases accordingly, eliminating any test that was only testing the old ObservationService behavior. The old ObservationService framework will be removed in the next commit. Added: trunk/dna-graph/src/main/java/org/jboss/dna/graph/observe/NetChangeObserver.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/observe/NetChangeObserver.java (rev 0) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/observe/NetChangeObserver.java 2009-05-21 22:26:25 UTC (rev 922) @@ -0,0 +1,354 @@ +/* + * JBoss DNA (http://www.jboss.org/dna) + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + * + * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA + * is licensed to you under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * JBoss DNA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.dna.graph.observe; + +import java.util.Collections; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import net.jcip.annotations.Immutable; +import net.jcip.annotations.NotThreadSafe; +import org.jboss.dna.common.util.HashCode; +import org.jboss.dna.graph.Location; +import org.jboss.dna.graph.property.Name; +import org.jboss.dna.graph.property.Path; +import org.jboss.dna.graph.property.Property; +import org.jboss.dna.graph.request.ChangeRequest; +import org.jboss.dna.graph.request.CreateNodeRequest; +import org.jboss.dna.graph.request.DeleteBranchRequest; +import org.jboss.dna.graph.request.DeleteChildrenRequest; +import org.jboss.dna.graph.request.RemovePropertyRequest; +import org.jboss.dna.graph.request.SetPropertyRequest; +import org.jboss.dna.graph.request.UpdatePropertiesRequest; + +/** + * A specialized {@link Observer} that figures out the net changes made during a single {@link Changes set of changes}. For + * example, if a property is updated and then updated again, the net change will be a single change. Or, if a node is created and + * then deleted, no net change will be observed. + */ +public abstract class NetChangeObserver extends ChangeObserver { + + public enum ChangeType { + NODE_ADDED, + NODE_REMOVED, + PROPERTY_ADDED, + PROPERTY_REMOVED, + PROPERTY_CHANGED; + } + + protected NetChangeObserver() { + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.observe.ChangeObserver#notify(org.jboss.dna.graph.observe.Changes) + */ + @Override + public void notify( Changes changes ) { + Map<String, Map<Location, NetChangeDetails>> detailsByLocationByWorkspace = new HashMap<String, Map<Location, NetChangeDetails>>(); + // Process each of the events, extracting the node path and property details for each ... + for (ChangeRequest change : changes) { + Location location = change.changedLocation(); + String workspace = change.changedWorkspace(); + + // Find the NetChangeDetails for this node ... + Map<Location, NetChangeDetails> detailsByLocation = detailsByLocationByWorkspace.get(workspace); + NetChangeDetails details = null; + if (detailsByLocation == null) { + detailsByLocation = new TreeMap<Location, NetChangeDetails>(); + detailsByLocationByWorkspace.put(workspace, detailsByLocation); + details = new NetChangeDetails(); + detailsByLocation.put(location, details); + } else { + details = detailsByLocation.get(location); + if (details == null) { + details = new NetChangeDetails(); + detailsByLocation.put(location, details); + } + } + + // Process the specific kind of change ... + if (change instanceof CreateNodeRequest) { + CreateNodeRequest create = (CreateNodeRequest)change; + details.addEventType(ChangeType.NODE_ADDED); + for (Property property : create) { + details.addProperty(property); + } + } else if (change instanceof UpdatePropertiesRequest) { + UpdatePropertiesRequest update = (UpdatePropertiesRequest)change; + for (Map.Entry<Name, Property> entry : update.properties().entrySet()) { + Property property = entry.getValue(); + if (property != null) { + details.changeProperty(property); + } else { + details.removeProperty(entry.getKey()); + } + } + } else if (change instanceof SetPropertyRequest) { + SetPropertyRequest set = (SetPropertyRequest)change; + details.changeProperty(set.property()); + } else if (change instanceof RemovePropertyRequest) { + RemovePropertyRequest remove = (RemovePropertyRequest)change; + details.removeProperty(remove.propertyName()); + } else if (change instanceof DeleteBranchRequest) { + details.addEventType(ChangeType.NODE_REMOVED); + } else if (change instanceof DeleteChildrenRequest) { + DeleteChildrenRequest delete = (DeleteChildrenRequest)change; + for (Location deletedChild : delete.getActualChildrenDeleted()) { + NetChangeDetails childDetails = detailsByLocation.get(location); + if (childDetails == null) { + childDetails = new NetChangeDetails(); + detailsByLocation.put(deletedChild, childDetails); + } + childDetails.addEventType(ChangeType.NODE_REMOVED); + } + } + } + + // Walk through the net changes ... + String sourceName = changes.getSourceName(); + for (Map.Entry<String, Map<Location, NetChangeDetails>> byWorkspaceEntry : detailsByLocationByWorkspace.entrySet()) { + String workspaceName = byWorkspaceEntry.getKey(); + // Iterate over the entries. Since we've used a TreeSet, we'll get these with the lower paths first ... + for (Map.Entry<Location, NetChangeDetails> entry : byWorkspaceEntry.getValue().entrySet()) { + Location location = entry.getKey(); + NetChangeDetails details = entry.getValue(); + notify(new NetChange(sourceName, workspaceName, location, details.getEventTypes(), + details.getModifiedProperties(), details.getRemovedProperties())); + } + } + } + + /** + * Method that is called for each net change. + * + * @param change + */ + protected abstract void notify( NetChange change ); + + /** + * A notification of changes to a node. + */ + @Immutable + public static class NetChange { + + private final String sourceName; + private final String workspaceName; + private final Location location; + private final EnumSet<ChangeType> eventTypes; + private final Set<Property> modifiedProperties; + private final Set<Name> removedProperties; + private final int hc; + + public NetChange( String sourceName, + String workspaceName, + Location location, + EnumSet<ChangeType> eventTypes, + Set<Property> modifiedProperties, + Set<Name> removedProperties ) { + assert sourceName != null; + assert workspaceName != null; + assert location != null; + this.sourceName = sourceName; + this.workspaceName = workspaceName; + this.location = location; + this.hc = HashCode.compute(this.workspaceName, this.location); + this.eventTypes = eventTypes; + if (modifiedProperties == null) modifiedProperties = Collections.emptySet(); + if (removedProperties == null) removedProperties = Collections.emptySet(); + this.modifiedProperties = Collections.unmodifiableSet(modifiedProperties); + this.removedProperties = Collections.unmodifiableSet(removedProperties); + } + + /** + * @return absolutePath + */ + public Path getPath() { + return this.location.getPath(); + } + + /** + * @return repositorySourceName + */ + public String getRepositorySourceName() { + return this.sourceName; + } + + /** + * @return repositoryWorkspaceName + */ + public String getRepositoryWorkspaceName() { + return this.workspaceName; + } + + /** + * @return modifiedProperties + */ + public Set<Property> getModifiedProperties() { + return this.modifiedProperties; + } + + /** + * @return removedProperties + */ + public Set<Name> getRemovedProperties() { + return this.removedProperties; + } + + /** + * {@inheritDoc} + */ + @Override + public int hashCode() { + return this.hc; + } + + public boolean includesAll( ChangeType... jcrEventTypes ) { + for (ChangeType jcrEventType : jcrEventTypes) { + if (!this.eventTypes.contains(jcrEventType)) return false; + } + return true; + } + + public boolean includes( ChangeType... jcrEventTypes ) { + for (ChangeType jcrEventType : jcrEventTypes) { + if (this.eventTypes.contains(jcrEventType)) return true; + } + return false; + } + + public boolean is( ChangeType jcrEventTypes ) { + return this.eventTypes.contains(jcrEventTypes); + } + + public boolean isSameNode( NetChange that ) { + if (that == this) return true; + if (this.hc != that.hc) return false; + if (!this.workspaceName.equals(that.workspaceName)) return false; + if (!this.location.equals(that.location)) return false; + return true; + } + + /** + * Determine whether this node change includes the setting of new value(s) for the supplied property. + * + * @param property the name of the property + * @return true if the named property has a new value on this node, or false otherwise + */ + public boolean isPropertyModified( String property ) { + return this.modifiedProperties.contains(property); + } + + /** + * Determine whether this node change includes the removal of the supplied property. + * + * @param property the name of the property + * @return true if the named property was removed from this node, or false otherwise + */ + public boolean isPropertyRemoved( String property ) { + return this.removedProperties.contains(property); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean equals( Object obj ) { + if (obj == this) return true; + if (obj instanceof NetChange) { + NetChange that = (NetChange)obj; + if (!this.isSameNode(that)) return false; + if (this.eventTypes != that.eventTypes) return false; + return true; + } + return false; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.workspaceName + "=>" + this.location; + } + } + + /** + * Internal utility class used in the computation of the net changes. + */ + @NotThreadSafe + private static class NetChangeDetails { + + private final Set<Property> modifiedProperties = new HashSet<Property>(); + private final Set<Name> removedProperties = new HashSet<Name>(); + private EnumSet<ChangeType> eventTypes = EnumSet.noneOf(ChangeType.class); + + protected NetChangeDetails() { + } + + public void addEventType( ChangeType eventType ) { + this.eventTypes.add(eventType); + } + + public void addProperty( Property property ) { + this.modifiedProperties.add(property); + this.eventTypes.add(ChangeType.PROPERTY_ADDED); + } + + public void changeProperty( Property property ) { + this.modifiedProperties.add(property); + this.eventTypes.add(ChangeType.PROPERTY_CHANGED); + } + + public void removeProperty( Name propertyName ) { + this.removedProperties.add(propertyName); + this.eventTypes.add(ChangeType.PROPERTY_REMOVED); + } + + /** + * @return nodeAction + */ + public EnumSet<ChangeType> getEventTypes() { + return this.eventTypes; + } + + /** + * @return addedProperties + */ + public Set<Property> getModifiedProperties() { + return this.modifiedProperties; + } + + /** + * @return removedProperties + */ + public Set<Name> getRemovedProperties() { + return this.removedProperties; + } + } +} Property changes on: trunk/dna-graph/src/main/java/org/jboss/dna/graph/observe/NetChangeObserver.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/ChangeRequest.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/ChangeRequest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/ChangeRequest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -52,4 +52,11 @@ * @return the location changed by this request */ public abstract Location changedLocation(); + + /** + * Get the name of the workspace that was changed by this request. + * + * @return the name of the workspace changed by this request + */ + public abstract String changedWorkspace(); } Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CloneWorkspaceRequest.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CloneWorkspaceRequest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CloneWorkspaceRequest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -243,6 +243,16 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.ChangeRequest#changedWorkspace() + */ + @Override + public String changedWorkspace() { + return actualWorkspaceName; + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.request.ChangeRequest#changes(java.lang.String, org.jboss.dna.graph.property.Path) */ @Override Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CopyBranchRequest.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CopyBranchRequest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CopyBranchRequest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -272,6 +272,16 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.ChangeRequest#changedWorkspace() + */ + @Override + public String changedWorkspace() { + return intoWorkspace(); + } + + /** + * {@inheritDoc} + * * @see java.lang.Object#hashCode() */ @Override Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CreateNodeRequest.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CreateNodeRequest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CreateNodeRequest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -324,12 +324,22 @@ */ @Override public Location changedLocation() { - return under; + return actualLocation; } /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.ChangeRequest#changedWorkspace() + */ + @Override + public String changedWorkspace() { + return workspaceName; + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.request.Request#cancel() */ @Override Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CreateWorkspaceRequest.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CreateWorkspaceRequest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CreateWorkspaceRequest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -204,6 +204,16 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.ChangeRequest#changedWorkspace() + */ + @Override + public String changedWorkspace() { + return actualWorkspaceName; + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.request.ChangeRequest#changes(java.lang.String, org.jboss.dna.graph.property.Path) */ @Override Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DeleteBranchRequest.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DeleteBranchRequest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DeleteBranchRequest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -139,6 +139,16 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.ChangeRequest#changedWorkspace() + */ + @Override + public String changedWorkspace() { + return workspaceName; + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.request.Request#cancel() */ @Override Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DeleteChildrenRequest.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DeleteChildrenRequest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DeleteChildrenRequest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -23,10 +23,13 @@ */ package org.jboss.dna.graph.request; +import java.util.LinkedList; +import java.util.List; import org.jboss.dna.common.util.CheckArg; import org.jboss.dna.graph.GraphI18n; import org.jboss.dna.graph.Location; import org.jboss.dna.graph.property.Path; +import org.jboss.dna.graph.property.Property; /** * Instruction that all nodes below a supplied node be deleted. This is similar to {@link DeleteBranchRequest}, except that the @@ -39,6 +42,7 @@ private final Location at; private final String workspaceName; private Location actualLocation; + private List<Location> actualChildrenDeleted = new LinkedList<Location>(); /** * Create a request to delete all children of the supplied node. The supplied parent node will not be deleted. @@ -105,6 +109,88 @@ } /** + * Add to the list of children that has been read the supplied children with the given path and identification properties. The + * children are added in order. + * + * @param children the locations of the children that were read + * @throws IllegalArgumentException if the parameter is null + * @throws IllegalStateException if the request is frozen + * @see #addDeletedChild(Location) + * @see #addDeletedChild(Path, Property) + * @see #addDeletedChild(Path, Property, Property...) + */ + public void addDeletedChildren( Iterable<Location> children ) { + checkNotFrozen(); + CheckArg.isNotNull(children, "children"); + for (Location child : children) { + if (child != null) this.actualChildrenDeleted.add(child); + } + } + + /** + * Add to the list of children that has been read the child with the given path and identification properties. The children + * should be added in order. + * + * @param child the location of the child that was read + * @throws IllegalArgumentException if the location is null + * @throws IllegalStateException if the request is frozen + * @see #addDeletedChild(Path, Property) + * @see #addDeletedChild(Path, Property, Property...) + */ + public void addDeletedChild( Location child ) { + checkNotFrozen(); + CheckArg.isNotNull(child, "child"); + this.actualChildrenDeleted.add(child); + } + + /** + * Add to the list of children that has been read the child with the given path and identification properties. The children + * should be added in order. + * + * @param pathToChild the path of the child that was just read + * @param firstIdProperty the first identification property of the child that was just read + * @param remainingIdProperties the remaining identification properties of the child that was just read + * @throws IllegalArgumentException if the path or identification properties are null + * @throws IllegalStateException if the request is frozen + * @see #addDeletedChild(Location) + * @see #addDeletedChild(Path, Property) + */ + public void addDeletedChild( Path pathToChild, + Property firstIdProperty, + Property... remainingIdProperties ) { + checkNotFrozen(); + Location child = Location.create(pathToChild, firstIdProperty, remainingIdProperties); + this.actualChildrenDeleted.add(child); + } + + /** + * Add to the list of children that has been read the child with the given path and identification property. The children + * should be added in order. + * + * @param pathToChild the path of the child that was just read + * @param idProperty the identification property of the child that was just read + * @throws IllegalArgumentException if the path or identification properties are null + * @throws IllegalStateException if the request is frozen + * @see #addDeletedChild(Location) + * @see #addDeletedChild(Path, Property, Property...) + */ + public void addDeletedChild( Path pathToChild, + Property idProperty ) { + checkNotFrozen(); + Location child = Location.create(pathToChild, idProperty); + this.actualChildrenDeleted.add(child); + } + + /** + * Get the list of the actual children that were deleted. + * + * @return the actual children, or empty if there were no children (if frozen) + */ + public List<Location> getActualChildrenDeleted() { + return actualChildrenDeleted; + } + + /** * Get the actual location of the node that was deleted. * * @return the actual location, or null if the actual location was not set @@ -137,6 +223,16 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.ChangeRequest#changedWorkspace() + */ + @Override + public String changedWorkspace() { + return workspaceName; + } + + /** + * {@inheritDoc} + * * @see java.lang.Object#equals(java.lang.Object) */ @Override Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DestroyWorkspaceRequest.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DestroyWorkspaceRequest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/DestroyWorkspaceRequest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -136,6 +136,16 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.ChangeRequest#changedWorkspace() + */ + @Override + public String changedWorkspace() { + return workspaceName; + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.request.ChangeRequest#changes(java.lang.String, org.jboss.dna.graph.property.Path) */ @Override Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/MoveBranchRequest.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/MoveBranchRequest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/MoveBranchRequest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -287,6 +287,16 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.ChangeRequest#changedWorkspace() + */ + @Override + public String changedWorkspace() { + return workspaceName; + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.request.Request#cancel() */ @Override Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/RemovePropertyRequest.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/RemovePropertyRequest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/RemovePropertyRequest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -194,6 +194,16 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.ChangeRequest#changedWorkspace() + */ + @Override + public String changedWorkspace() { + return workspaceName; + } + + /** + * {@inheritDoc} + * * @see java.lang.Object#toString() */ @Override Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/RenameNodeRequest.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/RenameNodeRequest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/RenameNodeRequest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -185,6 +185,16 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.ChangeRequest#changedWorkspace() + */ + @Override + public String changedWorkspace() { + return workspaceName; + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.request.Request#cancel() */ @Override Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/SetPropertyRequest.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/SetPropertyRequest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/SetPropertyRequest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -194,6 +194,16 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.ChangeRequest#changedWorkspace() + */ + @Override + public String changedWorkspace() { + return workspaceName; + } + + /** + * {@inheritDoc} + * * @see java.lang.Object#toString() */ @Override Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/UpdatePropertiesRequest.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/UpdatePropertiesRequest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/UpdatePropertiesRequest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -212,6 +212,16 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.request.ChangeRequest#changedWorkspace() + */ + @Override + public String changedWorkspace() { + return workspaceName; + } + + /** + * {@inheritDoc} + * * @see java.lang.Object#toString() */ @Override Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/processor/RequestProcessor.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/processor/RequestProcessor.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/processor/RequestProcessor.java 2009-05-21 22:26:25 UTC (rev 922) @@ -436,6 +436,7 @@ if (request.isCancelled()) return; DeleteBranchRequest deleteChild = new DeleteBranchRequest(child, request.inWorkspace()); process(deleteChild); + request.addDeletedChild(child); } // Set the actual location of the parent node ... Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/SessionCache.java =================================================================== --- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/SessionCache.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/SessionCache.java 2009-05-21 22:26:25 UTC (rev 922) @@ -71,6 +71,7 @@ import org.jboss.dna.graph.property.ValueFormatException; import org.jboss.dna.graph.request.BatchRequestBuilder; import org.jboss.dna.graph.request.ChangeRequest; +import org.jboss.dna.graph.request.CreateNodeRequest; import org.jboss.dna.graph.request.Request; import org.jboss.dna.jcr.cache.ChangedNodeInfo; import org.jboss.dna.jcr.cache.ChildNode; @@ -624,7 +625,13 @@ if (change.changes(workspaceName, path)) { branchRequests.add(request); // Record the UUID of the node being saved now ... - UUID changedUuid = change.changedLocation().getUuid(); + UUID changedUuid = null; + if (change instanceof CreateNodeRequest) { + // We want the parent UUID ... + changedUuid = ((CreateNodeRequest)change).under().getUuid(); + } else { + changedUuid = change.changedLocation().getUuid(); + } assert changedUuid != null; branchUuids.add(changedUuid); } else { @@ -665,13 +672,13 @@ throw new ConstraintViolationException(); } } - + for (UUID changedUuid : uuidsUnderBranch) { if (!this.deletedNodes.containsKey(changedUuid)) { checkAgainstTypeDefinitions(changedUuid, false); } } - + // Now execute the branch ... Graph.Batch branchBatch = store.batch(new BatchRequestBuilder(branchRequests)); try { @@ -1302,8 +1309,8 @@ if (!definition.getId().equals(node.getDefinitionId())) { // The node definition changed, so try to set the property ... try { - JcrValue value = new JcrValue(factories(), SessionCache.this, PropertyType.STRING, - definition.getId().getString()); + JcrValue value = new JcrValue(factories(), SessionCache.this, PropertyType.STRING, definition.getId() + .getString()); setProperty(DnaIntLexicon.NODE_DEFINITON, value); } catch (ConstraintViolationException e) { // We can't set this property on the node (according to the node definition). @@ -1536,7 +1543,10 @@ // --------------------------------------- // Now record the changes to the store ... // --------------------------------------- - Graph.Create<Graph.Batch> create = operations.createUnder(currentLocation).nodeNamed(name).with(desiredUuid).with(primaryTypeProp); + Graph.Create<Graph.Batch> create = operations.createUnder(currentLocation) + .nodeNamed(name) + .with(desiredUuid) + .with(primaryTypeProp); if (nodeDefnDefn != null) { create = create.with(nodeDefinitionProp); } @@ -2291,8 +2301,8 @@ DnaIntLexicon.MULTI_VALUED_PROPERTIES, values, false); - Property dnaProp = propertyFactory.create(DnaIntLexicon.MULTI_VALUED_PROPERTIES, - newSingleMultiPropertyNames.iterator().next()); + Property dnaProp = propertyFactory.create(DnaIntLexicon.MULTI_VALUED_PROPERTIES, newSingleMultiPropertyNames.iterator() + .next()); PropertyId propId = new PropertyId(uuid, dnaProp.getName()); JcrPropertyDefinition defn = (JcrPropertyDefinition)propertyDefinition; return new PropertyInfo(propId, defn.getId(), PropertyType.STRING, dnaProp, defn.isMultiple(), true, false); Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/Sequencer.java =================================================================== --- trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/Sequencer.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/Sequencer.java 2009-05-21 22:26:25 UTC (rev 922) @@ -29,6 +29,7 @@ import org.jboss.dna.common.component.Component; import org.jboss.dna.graph.Node; import org.jboss.dna.graph.io.Destination; +import org.jboss.dna.graph.observe.NetChangeObserver.NetChange; import org.jboss.dna.repository.observation.NodeChange; import org.jboss.dna.repository.observation.NodeChanges; import org.jboss.dna.repository.observation.ObservationService; @@ -53,10 +54,10 @@ * this sequencer, and closing any other acquired resources, even in the case of exceptions. * <p> * The {@link SequencingService} determines the sequencers that should be executed by monitoring the changes to one or more - * workspaces (it is a listener registered with the {@link ObservationService}). Changes in those workspaces - * are aggregated for each transaction, and organized into {@link NodeChanges changes for each node}. The SequencingService - * then determines for each {@link NodeChange set of changes to a node} the set of full paths to the properties that have - * changed and whether those paths {@link SequencerPathExpression#matcher(String) match} the sequencer's + * workspaces (it is a listener registered with the {@link ObservationService}). Changes in those workspaces are aggregated + * for each transaction, and organized into {@link NodeChanges changes for each node}. The SequencingService then determines + * for each {@link NodeChange set of changes to a node} the set of full paths to the properties that have changed and whether + * those paths {@link SequencerPathExpression#matcher(String) match} the sequencer's * {@link SequencerConfig#getPathExpressions() path expressions}. Each path expression produces the path to the output node, * and these output paths are accumulated and (with the original node that changed, the node change summary, and other * information) supplied to the sequencer via this method. @@ -79,7 +80,7 @@ */ void execute( Node input, String sequencedPropertyName, - NodeChange changes, + NetChange changes, Set<RepositoryNodePath> outputPaths, SequencerContext context, Problems problems ) throws SequencerException; Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/SequencingService.java =================================================================== --- trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/SequencingService.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/SequencingService.java 2009-05-21 22:26:25 UTC (rev 922) @@ -34,7 +34,6 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import javax.jcr.observation.Event; import net.jcip.annotations.Immutable; import net.jcip.annotations.ThreadSafe; import org.jboss.dna.common.collection.SimpleProblems; @@ -48,24 +47,28 @@ import org.jboss.dna.graph.Graph; import org.jboss.dna.graph.Node; import org.jboss.dna.graph.connector.RepositorySource; +import org.jboss.dna.graph.observe.ChangeObserver; +import org.jboss.dna.graph.observe.NetChangeObserver; +import org.jboss.dna.graph.observe.NetChangeObserver.NetChange; +import org.jboss.dna.graph.property.Name; +import org.jboss.dna.graph.property.Path; +import org.jboss.dna.graph.property.Property; import org.jboss.dna.repository.RepositoryI18n; import org.jboss.dna.repository.RepositoryLibrary; import org.jboss.dna.repository.observation.NodeChange; -import org.jboss.dna.repository.observation.NodeChangeListener; -import org.jboss.dna.repository.observation.NodeChanges; import org.jboss.dna.repository.service.AbstractServiceAdministrator; import org.jboss.dna.repository.service.AdministeredService; import org.jboss.dna.repository.service.ServiceAdministrator; import org.jboss.dna.repository.util.RepositoryNodePath; /** - * A sequencing system is used to monitor changes in the content of DNA repositories and to sequence the - * content to extract or to generate structured information. + * A sequencing system is used to monitor changes in the content of DNA repositories and to sequence the content to extract or to + * generate structured information. * * @author Randall Hauch * @author John Verhaeg */ -public class SequencingService implements AdministeredService, NodeChangeListener { +public class SequencingService implements AdministeredService { /** * Interface used to select the set of {@link Sequencer} instances that should be run. @@ -84,7 +87,7 @@ */ List<Sequencer> selectSequencers( List<Sequencer> sequencers, Node node, - NodeChange nodeChange ); + NetChange nodeChange ); } /** @@ -97,52 +100,17 @@ public List<Sequencer> selectSequencers( List<Sequencer> sequencers, Node node, - NodeChange nodeChange ) { + NetChange nodeChange ) { return sequencers; } } /** - * Interface used to determine whether a {@link NodeChange} should be processed. - * - * @author Randall Hauch - */ - public static interface NodeFilter { - - /** - * Determine whether the node represented by the supplied change should be submitted for sequencing. - * - * @param nodeChange the node change event - * @return true if the node should be submitted for sequencing, or false if the change should be ignored - */ - boolean accept( NodeChange nodeChange ); - } - - /** - * The default filter implementation, which accepts only new nodes or nodes that have new or changed properties. - * - * @author Randall Hauch - */ - protected static class DefaultNodeFilter implements NodeFilter { - - public boolean accept( NodeChange nodeChange ) { - // Only care about new nodes or nodes that have new/changed properies ... - return nodeChange.includesEventTypes(Event.NODE_ADDED, Event.PROPERTY_ADDED, Event.PROPERTY_CHANGED); - } - } - - /** * The default {@link Selector} that considers every {@link Sequencer} to be used for every node. * * @see SequencingService#setSequencerSelector(org.jboss.dna.repository.sequencer.SequencingService.Selector) */ public static final Selector DEFAULT_SEQUENCER_SELECTOR = new DefaultSelector(); - /** - * The default {@link NodeFilter} that accepts new nodes or nodes that have new/changed properties. - * - * @see SequencingService#setSequencerSelector(org.jboss.dna.repository.sequencer.SequencingService.Selector) - */ - public static final NodeFilter DEFAULT_NODE_FILTER = new DefaultNodeFilter(); /** * Class loader factory instance that always returns the {@link Thread#getContextClassLoader() current thread's context class @@ -201,9 +169,9 @@ private ExecutionContext executionContext; private SequencerLibrary sequencerLibrary = new SequencerLibrary(); private Selector sequencerSelector = DEFAULT_SEQUENCER_SELECTOR; - private NodeFilter nodeFilter = DEFAULT_NODE_FILTER; private ExecutorService executorService; private RepositoryLibrary repositoryLibrary; + private ChangeObserver repositoryObserver; private final Statistics statistics = new Statistics(); private final Administrator administrator = new Administrator(); @@ -311,11 +279,11 @@ public RepositoryLibrary getRepositoryLibrary() { return this.repositoryLibrary; } - - public void setRepositoryLibrary(RepositoryLibrary repositoryLibrary) { + + public void setRepositoryLibrary( RepositoryLibrary repositoryLibrary ) { this.repositoryLibrary = repositoryLibrary; } - + /** * Get the executor service used to run the sequencers. * @@ -373,8 +341,11 @@ } assert this.executorService != null; assert this.sequencerSelector != null; - assert this.nodeFilter != null; assert this.sequencerLibrary != null; + assert this.repositoryLibrary != null; + this.repositoryObserver = new RepositoryObserver(); + // Register the observer ... + this.repositoryLibrary.register(this.repositoryObserver); } protected void shutdownService() { @@ -415,79 +386,41 @@ } /** - * Get the node filter used by this system. - * - * @return the node filter - */ - public NodeFilter getNodeFilter() { - return this.nodeFilter; - } - - /** - * Set the filter that checks which nodes are to be sequenced, or null if the {@link #DEFAULT_NODE_FILTER default node filter} - * should be used. - * - * @param nodeFilter the new node filter - */ - public void setNodeFilter( NodeFilter nodeFilter ) { - this.nodeFilter = nodeFilter != null ? nodeFilter : DEFAULT_NODE_FILTER; - } - - /** - * {@inheritDoc} - */ - public void onNodeChanges( NodeChanges changes ) { - NodeFilter filter = this.getNodeFilter(); - for (final NodeChange changedNode : changes) { - // Only care about new nodes or nodes that have new/changed properies ... - if (filter.accept(changedNode)) { - try { - this.executorService.execute(new Runnable() { - - public void run() { - processChangedNode(changedNode); - } - }); - } catch (RejectedExecutionException e) { - // The executor service has been shut down, so do nothing with this set of changes - } - } - } - } - - /** * Do the work of processing by sequencing the node. This method is called by the {@link #executorService executor service} * when it performs it's work on the enqueued {@link NodeChange NodeChange runnable objects}. * - * @param changedNode the node to be processed. + * @param change the change describing the node to be processed. */ - protected void processChangedNode( NodeChange changedNode ) { + protected void processChange( NetChange change ) { final ExecutionContext context = this.getExecutionContext(); final Logger logger = context.getLogger(getClass()); assert logger != null; - + try { - final String repositorySourceName = changedNode.getRepositorySourceName(); - final String repositoryWorkspaceName = changedNode.getRepositoryWorkspaceName(); + final String repositorySourceName = change.getRepositorySourceName(); + final String repositoryWorkspaceName = change.getRepositoryWorkspaceName(); // Figure out which sequencers accept this path, // and track which output nodes should be passed to each sequencer... - final String nodePath = changedNode.getAbsolutePath(); + final Path nodePath = change.getPath(); + final String nodePathStr = context.getValueFactories().getStringFactory().create(nodePath); Map<SequencerCall, Set<RepositoryNodePath>> sequencerCalls = new HashMap<SequencerCall, Set<RepositoryNodePath>>(); List<Sequencer> allSequencers = this.sequencerLibrary.getInstances(); List<Sequencer> sequencers = new ArrayList<Sequencer>(allSequencers.size()); for (Sequencer sequencer : allSequencers) { final SequencerConfig config = sequencer.getConfiguration(); for (SequencerPathExpression pathExpression : config.getPathExpressions()) { - for (String propertyName : changedNode.getModifiedProperties()) { - String path = nodePath + "/@" + propertyName; + for (Property property : change.getModifiedProperties()) { + Name propertyName = property.getName(); + String propertyNameStr = context.getValueFactories().getStringFactory().create(propertyName); + String path = nodePathStr + "/@" + propertyNameStr; SequencerPathExpression.Matcher matcher = pathExpression.matcher(path); if (matcher.matches()) { // String selectedPath = matcher.getSelectedPath(); RepositoryNodePath outputPath = RepositoryNodePath.parse(matcher.getOutputPath(), repositorySourceName, repositoryWorkspaceName); - SequencerCall call = new SequencerCall(sequencer, propertyName); + SequencerCall call = new SequencerCall(sequencer, propertyNameStr); // Record the output path ... Set<RepositoryNodePath> outputPaths = sequencerCalls.get(call); if (outputPaths == null) { @@ -508,16 +441,15 @@ if (!sequencers.isEmpty()) { // Find the changed node ... - String relPath = changedNode.getAbsolutePath().replaceAll("^/+", ""); - node = graph.getNodeAt(relPath); + node = graph.getNodeAt(nodePath); // Figure out which sequencers should run ... - sequencers = this.sequencerSelector.selectSequencers(sequencers, node, changedNode); + sequencers = this.sequencerSelector.selectSequencers(sequencers, node, change); } if (sequencers.isEmpty()) { this.statistics.recordNodeSkipped(); if (logger.isDebugEnabled()) { - logger.trace("Skipping '{0}': no sequencers matched this condition", changedNode); + logger.trace("Skipping '{0}': no sequencers matched this condition", change); } } else { // Run each of those sequencers ... @@ -536,16 +468,16 @@ final SimpleProblems problems = new SimpleProblems(); SequencerContext sequencerContext = new SequencerContext(context, graph); try { - sequencer.execute(node, propertyName, changedNode, outputPaths, sequencerContext, problems); + sequencer.execute(node, propertyName, change, outputPaths, sequencerContext, problems); sequencerContext.getDestination().submit(); } catch (SequencerException e) { - logger.error(e, RepositoryI18n.errorWhileSequencingNode, sequencerName, changedNode); + logger.error(e, RepositoryI18n.errorWhileSequencingNode, sequencerName, change); } } this.statistics.recordNodeSequenced(); } } catch (Throwable e) { - logger.error(e, RepositoryI18n.errorFindingSequencersToRunAgainstNode, changedNode); + logger.error(e, RepositoryI18n.errorFindingSequencersToRunAgainstNode, change); } } @@ -655,4 +587,31 @@ return false; } } + + protected class RepositoryObserver extends NetChangeObserver { + protected RepositoryObserver() { + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.observe.NetChangeObserver#notify(org.jboss.dna.graph.observe.NetChangeObserver.NetChange) + */ + @Override + protected void notify( final NetChange change ) { + // Only care about new nodes or nodes that have new/changed properies ... + if (change.includes(ChangeType.NODE_ADDED, ChangeType.PROPERTY_ADDED, ChangeType.PROPERTY_CHANGED)) { + try { + getExecutorService().execute(new Runnable() { + + public void run() { + processChange(change); + } + }); + } catch (RejectedExecutionException e) { + // The executor service has been shut down, so do nothing with this set of changes + } + } + } + } } Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/StreamSequencerAdapter.java =================================================================== --- trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/StreamSequencerAdapter.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/StreamSequencerAdapter.java 2009-05-21 22:26:25 UTC (rev 922) @@ -33,6 +33,7 @@ import java.util.Set; import org.jboss.dna.common.collection.Problems; import org.jboss.dna.graph.Node; +import org.jboss.dna.graph.observe.NetChangeObserver.NetChange; import org.jboss.dna.graph.property.Path; import org.jboss.dna.graph.property.PathFactory; import org.jboss.dna.graph.property.Property; @@ -41,7 +42,6 @@ import org.jboss.dna.graph.sequencer.StreamSequencer; import org.jboss.dna.graph.sequencer.StreamSequencerContext; import org.jboss.dna.repository.RepositoryI18n; -import org.jboss.dna.repository.observation.NodeChange; import org.jboss.dna.repository.util.RepositoryNodePath; /** @@ -78,7 +78,7 @@ */ public void execute( Node input, String sequencedPropertyName, - NodeChange changes, + NetChange changes, Set<RepositoryNodePath> outputPaths, SequencerContext context, Problems problems ) throws SequencerException { Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/DnaEngineTest.java =================================================================== --- trunk/dna-repository/src/test/java/org/jboss/dna/repository/DnaEngineTest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/DnaEngineTest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -31,13 +31,11 @@ import static org.mockito.Mockito.stub; import java.io.ByteArrayInputStream; import java.io.InputStream; -import java.util.Arrays; import java.util.concurrent.TimeUnit; import javax.jcr.observation.Event; import org.jboss.dna.graph.connector.RepositoryConnection; import org.jboss.dna.graph.connector.inmemory.InMemoryRepositorySource; import org.jboss.dna.graph.mimetype.MimeTypeDetector; -import org.jboss.dna.repository.observation.NodeChanges; import org.jboss.dna.repository.sequencer.MockSequencerA; import org.jboss.dna.repository.sequencer.SequencingService; import org.junit.Before; @@ -160,11 +158,6 @@ SequencingService sequencer = engine.getSequencingService(); assertThat(sequencer.getStatistics().getNumberOfNodesSequenced(), is(0L)); - NodeChanges changes = NodeChanges.create("config repo", "", Arrays.asList(new Event[] {})); - sequencer.onNodeChanges(changes); - - assertThat(sequencer.getStatistics().getNumberOfNodesSequenced(), is(0L)); - Event e1 = mock(Event.class); stub(e1.getType()).toReturn(Event.NODE_ADDED); stub(e1.getPath()).toReturn("/test"); Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencer/MockSequencerA.java =================================================================== --- trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencer/MockSequencerA.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencer/MockSequencerA.java 2009-05-21 22:26:25 UTC (rev 922) @@ -31,7 +31,7 @@ import net.jcip.annotations.ThreadSafe; import org.jboss.dna.common.collection.Problems; import org.jboss.dna.graph.Node; -import org.jboss.dna.repository.observation.NodeChange; +import org.jboss.dna.graph.observe.NetChangeObserver.NetChange; import org.jboss.dna.repository.util.RepositoryNodePath; /** @@ -68,7 +68,7 @@ */ public void execute( Node input, String sequencedPropertyName, - NodeChange changes, + NetChange changes, Set<RepositoryNodePath> outputPaths, SequencerContext context, Problems problems ) { Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencer/MockSequencerB.java =================================================================== --- trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencer/MockSequencerB.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencer/MockSequencerB.java 2009-05-21 22:26:25 UTC (rev 922) @@ -31,7 +31,7 @@ import net.jcip.annotations.ThreadSafe; import org.jboss.dna.common.collection.Problems; import org.jboss.dna.graph.Node; -import org.jboss.dna.repository.observation.NodeChange; +import org.jboss.dna.graph.observe.NetChangeObserver.NetChange; import org.jboss.dna.repository.util.RepositoryNodePath; /** @@ -68,7 +68,7 @@ */ public void execute( Node input, String sequencedPropertyName, - NodeChange changes, + NetChange changes, Set<RepositoryNodePath> outputPaths, SequencerContext context, Problems problems ) { Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencer/SequencingServiceTest.java =================================================================== --- trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencer/SequencingServiceTest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencer/SequencingServiceTest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -30,30 +30,22 @@ import static org.hamcrest.core.IsSame.sameInstance; import static org.junit.Assert.assertThat; import static org.junit.matchers.JUnitMatchers.hasItem; -import java.io.IOException; import java.util.Collections; import java.util.concurrent.TimeUnit; -import javax.jcr.Node; -import javax.jcr.RepositoryException; -import javax.jcr.Session; import javax.jcr.observation.Event; -import org.jboss.dna.common.SystemFailureException; -import org.jboss.dna.common.jcr.AbstractJcrRepositoryTest; +import org.jboss.dna.graph.ExecutionContext; +import org.jboss.dna.graph.Graph; import org.jboss.dna.graph.connector.inmemory.InMemoryRepositorySource; import org.jboss.dna.repository.RepositoryLibrary; -import org.jboss.dna.repository.observation.ObservationService; import org.jboss.dna.repository.service.ServiceAdministrator; -import org.jboss.dna.repository.util.JcrExecutionContext; -import org.jboss.dna.repository.util.SessionFactory; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; /** * @author Randall Hauch */ -public class SequencingServiceTest extends AbstractJcrRepositoryTest { +public class SequencingServiceTest { public static final int ALL_EVENT_TYPES = Event.NODE_ADDED | Event.NODE_REMOVED | Event.PROPERTY_ADDED | Event.PROPERTY_CHANGED | Event.PROPERTY_REMOVED; @@ -62,9 +54,8 @@ public static final String REPOSITORY_WORKSPACE_NAME = "testRepository-Workspace"; private RepositoryLibrary sources; - private ObservationService observationService; private SequencingService sequencingService; - private JcrExecutionContext executionContext; + private ExecutionContext executionContext; @Before public void beforeEach() { @@ -72,32 +63,17 @@ InMemoryRepositorySource source = new InMemoryRepositorySource(); source.setName(REPOSITORY_SOURCE_NAME); sources.addSource(source); - - SessionFactory sessionFactory = new SessionFactory() { - public Session createSession( String name ) throws RepositoryException { - assertThat(name, is(REPOSITORY_WORKSPACE_NAME)); - try { - return getRepository().login(getTestCredentials()); - } catch (IOException e) { - throw new SystemFailureException(e); - } - } - }; - this.executionContext = new JcrExecutionContext(sessionFactory, REPOSITORY_WORKSPACE_NAME); + + this.executionContext = new ExecutionContext(); this.sequencingService = new SequencingService(); this.sequencingService.setExecutionContext(this.executionContext); this.sequencingService.setRepositoryLibrary(sources); - this.observationService = new ObservationService(this.executionContext.getSessionFactory()); - this.observationService.addListener(this.sequencingService); } @After public void afterEach() throws Exception { - this.observationService.getAdministrator().shutdown(); - this.observationService.getAdministrator().awaitTermination(5, TimeUnit.SECONDS); this.sequencingService.getAdministrator().shutdown(); this.sequencingService.getAdministrator().awaitTermination(5, TimeUnit.SECONDS); - super.shutdownRepository(); } @Test @@ -210,108 +186,6 @@ } @Test - public void shouldBeAbleToMonitorWorkspaceWhenPausedOrStarted() throws Exception { - startRepository(); - Session session = getRepository().login(getTestCredentials()); - - // Try when paused ... - assertThat(sequencingService.getAdministrator().isPaused(), is(true)); - assertThat(observationService.getAdministrator().pause().isPaused(), is(true)); - ObservationService.WorkspaceListener listener = observationService.monitor(REPOSITORY_SOURCE_NAME, REPOSITORY_WORKSPACE_NAME, Event.NODE_ADDED); - assertThat(listener, is(notNullValue())); - assertThat(listener.getAbsolutePath(), is("/")); - assertThat(listener.getEventTypes(), is(Event.NODE_ADDED)); - - // Cause an event ... - session.getRootNode().addNode("testnodeA", "nt:unstructured"); - session.save(); - Thread.sleep(100); // let the events be handled ... - assertThat(observationService.getStatistics().getNumberOfEventsIgnored(), is((long)1)); - - // Reset the statistics and remove the listener ... - sequencingService.getStatistics().reset(); - observationService.getStatistics().reset(); - assertThat(listener.isRegistered(), is(true)); - listener.unregister(); - assertThat(listener.isRegistered(), is(false)); - - // Start the sequencing sequencingService and try monitoring the workspace ... - assertThat(sequencingService.getAdministrator().start().isStarted(), is(true)); - assertThat(observationService.getAdministrator().start().isStarted(), is(true)); - ObservationService.WorkspaceListener listener2 = observationService.monitor(REPOSITORY_SOURCE_NAME, REPOSITORY_WORKSPACE_NAME, Event.NODE_ADDED); - assertThat(listener2.isRegistered(), is(true)); - assertThat(listener2, is(notNullValue())); - assertThat(listener2.getAbsolutePath(), is("/")); - assertThat(listener2.getEventTypes(), is(Event.NODE_ADDED)); - - // Cause an event ... - session.getRootNode().addNode("testnodeB", "nt:unstructured"); - session.save(); - Thread.sleep(100); // let the events be handled ... - - // Check the results: nothing ignored, and 1 node skipped (since no sequencers apply) - assertThat(observationService.getStatistics().getNumberOfEventsIgnored(), is((long)0)); - assertThat(sequencingService.getStatistics().getNumberOfNodesSkipped(), is((long)1)); - - sequencingService.getAdministrator().shutdown(); - sequencingService.getStatistics().reset(); - observationService.getAdministrator().shutdown(); - observationService.getStatistics().reset(); - - // Cause another event ... - session.getRootNode().addNode("testnodeC", "nt:unstructured"); - session.save(); - Thread.sleep(100); // let the events be handled ... - // The listener should no longer be registered ... - assertThat(listener2.isRegistered(), is(false)); - - // Check the results: nothing ignored, and nothing skipped - assertThat(observationService.getStatistics().getNumberOfEventsIgnored(), is((long)0)); - assertThat(sequencingService.getStatistics().getNumberOfNodesSkipped(), is((long)0)); - } - - @Test - public void shouldUnregisterAllWorkspaceListenersWhenSystemIsShutdownAndNotWhenPaused() throws Exception { - startRepository(); - Session session = getRepository().login(getTestCredentials()); - - // Start the sequencing sequencingService and try monitoring the workspace ... - assertThat(sequencingService.getAdministrator().start().isStarted(), is(true)); - ObservationService.WorkspaceListener listener = observationService.monitor(REPOSITORY_SOURCE_NAME, REPOSITORY_WORKSPACE_NAME, Event.NODE_ADDED); - assertThat(listener.isRegistered(), is(true)); - assertThat(listener, is(notNullValue())); - assertThat(listener.getAbsolutePath(), is("/")); - assertThat(listener.getEventTypes(), is(Event.NODE_ADDED)); - - // Cause an event ... - session.getRootNode().addNode("testnodeB", "nt:unstructured"); - session.save(); - assertThat(listener.isRegistered(), is(true)); - - // Pause the sequencingService, can cause an event ... - sequencingService.getAdministrator().pause(); - session.getRootNode().addNode("testnodeB", "nt:unstructured"); - session.save(); - assertThat(listener.isRegistered(), is(true)); - - // Shut down the services and await termination ... - sequencingService.getAdministrator().shutdown(); - observationService.getAdministrator().shutdown(); - sequencingService.getAdministrator().awaitTermination(2, TimeUnit.SECONDS); - observationService.getAdministrator().awaitTermination(2, TimeUnit.SECONDS); - - // Cause another event ... - session.getRootNode().addNode("testnodeC", "nt:unstructured"); - session.save(); - - // The listener should no longer be registered ... - assertThat(listener.isRegistered(), is(false)); - } - - // FIXME: This test needs to be unignored after the observation service is re-written to not use JCR - - @Ignore - @Test public void shouldExecuteSequencersUponChangesToRepositoryThatMatchSequencerPathExpressions() throws Exception { // Add configurations for a sequencer ... String name = "MockSequencerA"; @@ -319,21 +193,16 @@ String classname = MockSequencerA.class.getName(); String[] classpath = null; String[] pathExpressions = {"/testnodeC/testnodeD/@description => ."}; - SequencerConfig configA = new SequencerConfig(name, desc, Collections.<String, Object>emptyMap(), classname, classpath, pathExpressions); + SequencerConfig configA = new SequencerConfig(name, desc, Collections.<String, Object>emptyMap(), classname, classpath, + pathExpressions); sequencingService.addSequencer(configA); - // Start the repository and get a session ... - startRepository(); - Session session = getRepository().login(getTestCredentials()); - // Start the sequencing sequencingService and try monitoring the workspace ... assertThat(sequencingService.getAdministrator().start().isStarted(), is(true)); - ObservationService.WorkspaceListener listener = observationService.monitor(REPOSITORY_SOURCE_NAME, REPOSITORY_WORKSPACE_NAME, ALL_EVENT_TYPES); - assertThat(listener.isRegistered(), is(true)); - assertThat(listener, is(notNullValue())); - assertThat(listener.getAbsolutePath(), is("/")); - assertThat(listener.getEventTypes(), is(ALL_EVENT_TYPES)); + // Create a graph for the source ... + Graph graph = Graph.create(sources.getSource(REPOSITORY_SOURCE_NAME), executionContext); + // The sequencer should not yet have run ... MockSequencerA sequencerA = (MockSequencerA)sequencingService.getSequencerLibrary().getInstances().get(0); assertThat(sequencerA, is(notNullValue())); @@ -342,22 +211,21 @@ assertThat(sequencingService.getSequencerLibrary().getInstances(), hasItem((Sequencer)sequencerA)); // Cause an event, but not one that the sequencer cares about ... - Node nodeC = session.getRootNode().addNode("testnodeC", "nt:unstructured"); - assertThat(nodeC, is(notNullValue())); - session.save(); + graph.batch().create("/testnodeC").with("jcr:primaryType", "nt:unstructured").and().execute(); + + // Verify that our sequencer was not called ... assertThat(sequencerA.getCounter(), is(0)); assertThat(sequencingService.getSequencerLibrary().getInstances(), hasItem((Sequencer)sequencerA)); // Cause another event, but again one that the sequencer does not care about ... - Node nodeD = nodeC.addNode("testnodeD", "nt:unstructured"); - assertThat(nodeD, is(notNullValue())); - session.save(); + graph.batch().create("/testnodeC/testnodeD").with("jcr:primaryType", "nt:unstructured").and().execute(); + + // Verify that our sequencer was not called ... assertThat(sequencerA.getCounter(), is(0)); assertThat(sequencingService.getSequencerLibrary().getInstances(), hasItem((Sequencer)sequencerA)); // Now set the property that the sequencer DOES care about ... - nodeD.setProperty("description", "This is the value"); - session.save(); + graph.batch().set("description").on("/testnodeC/testnodeD").to("This is the value").and().execute(); // Wait for the event to be processed and the sequencer to be called ... sequencerA.awaitExecution(4, TimeUnit.SECONDS); // wait for the sequencer to be called Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencer/StreamSequencerAdapterTest.java =================================================================== --- trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencer/StreamSequencerAdapterTest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencer/StreamSequencerAdapterTest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -34,24 +34,26 @@ import java.io.InputStream; import java.util.Arrays; import java.util.Collections; +import java.util.EnumSet; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import javax.jcr.observation.Event; import org.jboss.dna.common.collection.Problems; import org.jboss.dna.common.collection.SimpleProblems; import org.jboss.dna.graph.ExecutionContext; import org.jboss.dna.graph.Graph; +import org.jboss.dna.graph.Location; import org.jboss.dna.graph.Node; import org.jboss.dna.graph.connector.inmemory.InMemoryRepositorySource; import org.jboss.dna.graph.mimetype.MimeTypeDetectors; +import org.jboss.dna.graph.observe.NetChangeObserver.ChangeType; +import org.jboss.dna.graph.observe.NetChangeObserver.NetChange; import org.jboss.dna.graph.property.Path; import org.jboss.dna.graph.property.PathNotFoundException; import org.jboss.dna.graph.property.Property; import org.jboss.dna.graph.sequencer.SequencerOutput; import org.jboss.dna.graph.sequencer.StreamSequencer; import org.jboss.dna.graph.sequencer.StreamSequencerContext; -import org.jboss.dna.repository.observation.NodeChange; import org.jboss.dna.repository.util.RepositoryNodePath; import org.junit.Before; import org.junit.Test; @@ -125,8 +127,11 @@ graph.set("sequencedProperty").on("/a/b/c").to(new ByteArrayInputStream(sampleData.getBytes())); Node inputNode = graph.getNodeAt("/a/b/c"); - NodeChange nodeChange = new NodeChange(repositorySourceName, repositoryWorkspaceName, "/a/b/c", Event.PROPERTY_CHANGED, - Collections.singleton("sequencedProperty"), null); + Location location = Location.create(context.getValueFactories().getPathFactory().create("/a/b/c")); + Property sequencedProperty = inputNode.getProperty("sequencedProperty"); + NetChange nodeChange = new NetChange(repositorySourceName, repositoryWorkspaceName, location, + EnumSet.of(ChangeType.PROPERTY_CHANGED), Collections.singleton(sequencedProperty), + null); Set<RepositoryNodePath> outputPaths = new HashSet<RepositoryNodePath>(); outputPaths.add(new RepositoryNodePath(repositorySourceName, repositoryWorkspaceName, "/d/e")); sequencerOutput.setProperty("alpha/beta", "isSomething", true); @@ -181,8 +186,11 @@ // Set the property that will be sequenced ... // Set up the node changes ... - NodeChange nodeChange = new NodeChange(repositorySourceName, repositoryWorkspaceName, "/a/b/c", Event.PROPERTY_CHANGED, - Collections.singleton("sequencedProperty"), null); + Location location = Location.create(context.getValueFactories().getPathFactory().create("/a/b/c")); + Property sequencedProperty = nodeC.getProperty("sequencedProperty"); + NetChange nodeChange = new NetChange(repositorySourceName, repositoryWorkspaceName, location, + EnumSet.of(ChangeType.PROPERTY_CHANGED), Collections.singleton(sequencedProperty), + null); // Set up the output directory ... Set<RepositoryNodePath> outputPaths = new HashSet<RepositoryNodePath>(); @@ -214,8 +222,11 @@ graph.set("sequencedProperty").on(nodeC.getLocation()).to((String)null); // Set up the node changes ... - NodeChange nodeChange = new NodeChange(repositorySourceName, repositoryWorkspaceName, "/a/b/c", Event.PROPERTY_CHANGED, - Collections.singleton("sequencedProperty"), null); + Location location = Location.create(context.getValueFactories().getPathFactory().create("/a/b/c")); + Property sequencedProperty = nodeC.getProperty("sequencedProperty"); + NetChange nodeChange = new NetChange(repositorySourceName, repositoryWorkspaceName, location, + EnumSet.of(ChangeType.PROPERTY_CHANGED), Collections.singleton(sequencedProperty), + null); // Set up the output directory ... Set<RepositoryNodePath> outputPaths = new HashSet<RepositoryNodePath>(); @@ -247,8 +258,11 @@ // assertThat(nodeE.getProperty("jcr:primaryType").getString(), is("nt:unstructured")); // Set up the node changes ... - NodeChange nodeChange = new NodeChange(repositorySourceName, repositoryWorkspaceName, "/a/b/c", Event.PROPERTY_CHANGED, - Collections.singleton("sequencedProperty"), null); + Location location = Location.create(context.getValueFactories().getPathFactory().create("/a/b/c")); + Property sequencedProperty = nodeC.getProperty("sequencedProperty"); + NetChange nodeChange = new NetChange(repositorySourceName, repositoryWorkspaceName, location, + EnumSet.of(ChangeType.PROPERTY_CHANGED), Collections.singleton(sequencedProperty), + null); // Set up the output directory ... Set<RepositoryNodePath> outputPaths = new HashSet<RepositoryNodePath>(); @@ -285,8 +299,11 @@ assertThat(nodeC, is(notNullValue())); // Set up the node changes ... - NodeChange nodeChange = new NodeChange(repositorySourceName, repositoryWorkspaceName, "/a/b/c", Event.PROPERTY_CHANGED, - Collections.singleton("sequencedProperty"), null); + Location location = Location.create(context.getValueFactories().getPathFactory().create("/a/b/c")); + Property sequencedProperty = nodeC.getProperty("sequencedProperty"); + NetChange nodeChange = new NetChange(repositorySourceName, repositoryWorkspaceName, location, + EnumSet.of(ChangeType.PROPERTY_CHANGED), Collections.singleton(sequencedProperty), + null); // Set up the output directory ... Set<RepositoryNodePath> outputPaths = new HashSet<RepositoryNodePath>(); @@ -327,8 +344,11 @@ assertThat(nodeC, is(notNullValue())); // Set up the node changes ... - NodeChange nodeChange = new NodeChange(repositorySourceName, repositoryWorkspaceName, "/a/b/c", Event.PROPERTY_CHANGED, - Collections.singleton("sequencedProperty"), null); + Location location = Location.create(context.getValueFactories().getPathFactory().create("/a/b/c")); + Property sequencedProperty = nodeC.getProperty("sequencedProperty"); + NetChange nodeChange = new NetChange(repositorySourceName, repositoryWorkspaceName, location, + EnumSet.of(ChangeType.PROPERTY_CHANGED), Collections.singleton(sequencedProperty), + null); // Set up the output directory ... Set<RepositoryNodePath> outputPaths = new HashSet<RepositoryNodePath>(); Modified: trunk/docs/examples/gettingstarted/sequencers/pom.xml =================================================================== --- trunk/docs/examples/gettingstarted/sequencers/pom.xml 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/docs/examples/gettingstarted/sequencers/pom.xml 2009-05-21 22:26:25 UTC (rev 922) @@ -18,7 +18,7 @@ <dependencies> <dependency> <groupId>org.jboss.dna</groupId> - <artifactId>dna-repository</artifactId> + <artifactId>dna-jcr</artifactId> <version>${pom.version}</version> <scope>compile</scope> </dependency> Modified: trunk/docs/examples/gettingstarted/sequencers/src/main/java/org/jboss/example/dna/sequencer/SequencingClient.java =================================================================== --- trunk/docs/examples/gettingstarted/sequencers/src/main/java/org/jboss/example/dna/sequencer/SequencingClient.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/docs/examples/gettingstarted/sequencers/src/main/java/org/jboss/example/dna/sequencer/SequencingClient.java 2009-05-21 22:26:25 UTC (rev 922) @@ -44,11 +44,9 @@ import javax.jcr.SimpleCredentials; import javax.jcr.Value; import javax.jcr.ValueFormatException; -import javax.jcr.observation.Event; import org.apache.jackrabbit.api.JackrabbitNodeTypeManager; import org.apache.jackrabbit.core.TransientRepository; import org.jboss.dna.common.SystemFailureException; -import org.jboss.dna.repository.observation.ObservationService; import org.jboss.dna.repository.sequencer.SequencerConfig; import org.jboss.dna.repository.sequencer.SequencingService; import org.jboss.dna.repository.util.JcrExecutionContext; @@ -83,7 +81,6 @@ private Session keepAliveSession; private Repository repository; private SequencingService sequencingService; - private ObservationService observationService; private UserInterface userInterface; private JcrExecutionContext executionContext; @@ -225,7 +222,7 @@ // Create the sequencing service, passing in the execution context and the repository library ... this.sequencingService = new SequencingService(); this.sequencingService.setExecutionContext(executionContext); - //this.sequencingService.setRepositoryLibrary(repositoryLibrary); + // this.sequencingService.setRepositoryLibrary(repositoryLibrary); // Configure the sequencers. In this example, we only two sequencers that processes image and mp3 files. // So create a configurations. Note that the sequencing service expects the class to be on the thread's current @@ -264,14 +261,6 @@ String[] javaPathExpressions = {"//(*.java[*])/jcr:content[@jcr:data] => /java/$1"}; SequencerConfig javaSequencerConfig = new SequencerConfig(name, desc, classname, classpath, javaPathExpressions); this.sequencingService.addSequencer(javaSequencerConfig); - - // Use the DNA observation service to listen to the JCR repository (or multiple ones), and - // then register the sequencing service as a listener to this observation service... - this.observationService = new ObservationService(this.executionContext.getSessionFactory()); - this.observationService.getAdministrator().start(); - this.observationService.addListener(this.sequencingService); - this.observationService.monitor(this.repositoryName, repositoryWorkspaceName, Event.NODE_ADDED | Event.PROPERTY_ADDED - | Event.PROPERTY_CHANGED); } // Start up the sequencing service ... this.sequencingService.getAdministrator().start(); @@ -288,12 +277,6 @@ // Shut down the service and wait until it's all shut down ... this.sequencingService.getAdministrator().shutdown(); this.sequencingService.getAdministrator().awaitTermination(5, TimeUnit.SECONDS); - - if (this.observationService != null) { - // Shut down the observation service ... - this.observationService.getAdministrator().shutdown(); - this.observationService.getAdministrator().awaitTermination(5, TimeUnit.SECONDS); - } } /** @@ -318,10 +301,10 @@ String mimeType = getMimeType(url); if (mimeType == null) { - System.err.println("Could not determine mime type for file. Cancelling upload."); - return; + System.err.println("Could not determine mime type for file. Cancelling upload."); + return; } - + // Now use the JCR API to upload the file ... Session session = createSession(); JcrTools tools = this.executionContext.getTools(); Modified: trunk/docs/examples/gettingstarted/sequencers/src/test/java/org/jboss/example/dna/sequencer/SequencingClientTest.java =================================================================== --- trunk/docs/examples/gettingstarted/sequencers/src/test/java/org/jboss/example/dna/sequencer/SequencingClientTest.java 2009-05-21 19:10:30 UTC (rev 921) +++ trunk/docs/examples/gettingstarted/sequencers/src/test/java/org/jboss/example/dna/sequencer/SequencingClientTest.java 2009-05-21 22:26:25 UTC (rev 922) @@ -91,6 +91,7 @@ } + @Ignore @Test public void shouldStartupAndShutdownRepositoryAndSequencingService() throws Exception { client.startRepository(); @@ -139,6 +140,7 @@ assertThat(client.getStatistics().getNumberOfNodesSequenced(), is(1l)); } + @Ignore @Test public void shouldUploadAndNotSequencePictFile() throws Exception { client.setUserInterface(new MockUserInterface(this.pictImageUrl, "/a/b/caution.pict", 0));