[dna-commits] DNA SVN: r919 - in trunk/dna-repository/src/main/java/org/jboss/dna/repository: sequencer and 1 other directory.

Author: rhauch Date: 2009-05-21 13:01:04 -0400 (Thu, 21 May 2009) New Revision: 919 Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/RepositoryService.java trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/StreamSequencerAdapter.java Log: DNA-401 Remove SequencingService Dependency on JCR Minor corrections to remove warnings and JavaDoc compiler errors. Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/RepositoryService.java =================================================================== --- trunk/dna-repository/src/main/java/org/jboss/dna/repository/RepositoryService.java 2009-05-21 16:44:53 UTC (rev 918) +++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/RepositoryService.java 2009-05-21 17:01:04 UTC (rev 919) @@ -251,6 +251,7 @@ if (problems.hasErrors()) return null; // Create the instance ... + assert classnameProperty != null; String classname = stringFactory.create(classnameProperty.getValues().next()); String[] classpath = classpathProperty == null ? new String[] {} : stringFactory.create(classpathProperty.getValuesAsArray()); ClassLoader classLoader = context.getClassLoader(classpath); @@ -265,6 +266,7 @@ } catch (Throwable err) { problems.addError(err, RepositoryI18n.unableToInstantiateClassUsingClasspath, classname, classpath); } + if (source == null) return null; // We need to set the name using the local name of the node... Property nameProperty = context.getPropertyFactory().create(JcrLexicon.NAME, 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 16:44:53 UTC (rev 918) +++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/StreamSequencerAdapter.java 2009-05-21 17:01:04 UTC (rev 919) @@ -164,7 +164,7 @@ /** * Creates all nodes along the given node path if they are missing. Ensures that nodePath is a valid path to a node. * - * @param nodePath the node path to create + * @param targetPath the node path to create * @param context the sequencer context under which it should be created */ private void buildPathTo( Path targetPath, @@ -241,7 +241,8 @@ Path path = factories.getPathFactory().create(input.getLocation().getPath()); Set<org.jboss.dna.graph.property.Property> props = new HashSet<org.jboss.dna.graph.property.Property>( - input.getPropertiesByName().values()); + input.getPropertiesByName() + .values()); props = Collections.unmodifiableSet(props); String mimeType = getMimeType(sequencedProperty, path.getLastSegment().getName().getLocalName()); return new StreamSequencerContext(context.getExecutionContext(), path, props, mimeType, problems);