Author: bcarothers Date: 2009-05-15 14:28:51 -0400 (Fri, 15 May 2009) New Revision: 908 Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrConfiguration.java trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/SessionCache.java Log: DNA-411 JcrRepository.Options Is Plural - Coding Convention Violation Fixed Javadoc Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrConfiguration.java =================================================================== --- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrConfiguration.java 2009-05-15 16:39:22 UTC (rev 907) +++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrConfiguration.java 2009-05-15 18:28:51 UTC (rev 908) @@ -168,7 +168,7 @@ } /** - * Interface for configuring the {@link JcrRepository.Options JCR repository options} for a {@link JcrRepository JCR + * Interface for configuring the {@link JcrRepository.Option JCR repository options} for a {@link JcrRepository JCR * repository}. * * @param <ReturnType> the interface returned after the option has been set. @@ -184,10 +184,10 @@ } /** - * The interface used to set the value for a {@link JcrRepository.Options JCR repository option}. + * The interface used to set the value for a {@link JcrRepository.Option JCR repository option}. * * @param <ReturnType> the interface returned from these methods - * @see JcrConfiguration.SetOptions#with(org.jboss.dna.jcr.JcrRepository.Options) + * @see JcrConfiguration.SetOptions#with(org.jboss.dna.jcr.JcrRepository.Option) */ public interface OptionSetter<ReturnType> { /** Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java =================================================================== --- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java 2009-05-15 16:39:22 UTC (rev 907) +++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java 2009-05-15 18:28:51 UTC (rev 908) @@ -83,7 +83,7 @@ * Flag that defines whether or not the node types should be exposed as content under the "{@code * /jcr:system/jcr:nodeTypes}" node. Value is either "<code>true</code>" or "<code>false</code>" (default). * - * @see DefaultOptions#PROJECT_NODE_TYPES + * @see DefaultOption#PROJECT_NODE_TYPES */ PROJECT_NODE_TYPES, /** @@ -94,16 +94,16 @@ } /** - * The default values for each of the {@link Options}. + * The default values for each of the {@link Option}. */ public static class DefaultOption { /** - * The default value for the {@link Options#PROJECT_NODE_TYPES} option is {@value} . + * The default value for the {@link Option#PROJECT_NODE_TYPES} option is {@value} . */ public static final String PROJECT_NODE_TYPES = Boolean.FALSE.toString(); /** - * The default value for the {@link Options#JAAS_LOGIN_CONFIG_NAME} option is {@value} . + * The default value for the {@link Option#JAAS_LOGIN_CONFIG_NAME} option is {@value} . */ public static final String JAAS_LOGIN_CONFIG_NAME = "dna-jcr"; } @@ -152,7 +152,7 @@ * @param connectionFactory the factory for repository connections * @param repositorySourceName the name of the repository source (in the connection factory) that should be used * @param descriptors the {@link #getDescriptorKeys() descriptors} for this repository; may be <code>null</code>. - * @param options the optional {@link Options settings} for this repository; may be null + * @param options the optional {@link Option settings} for this repository; may be null * @throws IllegalArgumentException If <code>executionContextFactory</code> or <code>connectionFactory</code> is * <code>null</code>. */ 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-15 16:39:22 UTC (rev 907) +++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/SessionCache.java 2009-05-15 18:28:51 UTC (rev 908) @@ -665,7 +665,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 {