You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2009/09/17 12:07:35 UTC
svn commit: r816123 - in /jackrabbit/sandbox/JCR-2170: ./ jackrabbit-core/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/
jackrabbit-core/src/main/java/org/apache/jac...
Author: mreutegg
Date: Thu Sep 17 10:07:34 2009
New Revision: 816123
URL: http://svn.apache.org/viewvc?rev=816123&view=rev
Log:
JCR-2170: Remove PropDefId and NodeDefId
- merge with recent changes from trunk
Added:
jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/DefinitionBuilderFactory.java
- copied unchanged from r816122, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/DefinitionBuilderFactory.java
jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/TemplateBuilderFactory.java
- copied unchanged from r816122, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/TemplateBuilderFactory.java
jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/QDefinitionBuilderFactory.java
- copied unchanged from r816122, jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/QDefinitionBuilderFactory.java
jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/QItemDefinitionBuilder.java
- copied unchanged from r816122, jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/QItemDefinitionBuilder.java
jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/QNodeDefinitionBuilder.java
- copied unchanged from r816122, jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/QNodeDefinitionBuilder.java
jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/QPropertyDefinitionBuilder.java
- copied unchanged from r816122, jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/QPropertyDefinitionBuilder.java
Removed:
jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/AbstractItemTypeDefinitionsBuilder.java
jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/ItemTemplatesBuilder.java
jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/QItemDefinitionsBuilder.java
Modified:
jackrabbit/sandbox/JCR-2170/ (props changed)
jackrabbit/sandbox/JCR-2170/RELEASE-NOTES.txt
jackrabbit/sandbox/JCR-2170/jackrabbit-core/pom.xml
jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractRecord.java
jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeDefStore.java
jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/BLOBFileValue.java
jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/CndImporter.java
jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/CompactNodeTypeDefReader.java
jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java
jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefTest.java
Propchange: jackrabbit/sandbox/JCR-2170/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 10:07:34 2009
@@ -1,3 +1,3 @@
/jackrabbit/branches/1.5:794012,794100,794102
/jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:812417-815796
+/jackrabbit/trunk:812417-816122
Modified: jackrabbit/sandbox/JCR-2170/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-2170/RELEASE-NOTES.txt?rev=816123&r1=816122&r2=816123&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-2170/RELEASE-NOTES.txt (original)
+++ jackrabbit/sandbox/JCR-2170/RELEASE-NOTES.txt Thu Sep 17 10:07:34 2009
@@ -1,4 +1,4 @@
-Release Notes -- Apache Jackrabbit -- Version 2.0-alpha10
+Release Notes -- Apache Jackrabbit -- Version 2.0-alpha11
Introduction
------------
@@ -38,6 +38,10 @@
* Data store feature enabled in the default repository configuration.
+ * Full text indexing with Apache Tika. Jackrabbit can now extract and
+ index the full text content of many new types of documents, including
+ the Office Open XML files produced by Microsoft Office 2007 and higher.
+
For more detailed information about all the changes in this and other
Jackrabbit releases, please see the Jackrabbit issue tracker at
Modified: jackrabbit/sandbox/JCR-2170/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-2170/jackrabbit-core/pom.xml?rev=816123&r1=816122&r2=816123&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-2170/jackrabbit-core/pom.xml (original)
+++ jackrabbit/sandbox/JCR-2170/jackrabbit-core/pom.xml Thu Sep 17 10:07:34 2009
@@ -129,6 +129,7 @@
<exclude>src/main/javadoc/**/*.uxf</exclude>
<exclude>src/test/repository/**</exclude>
<exclude>src/test/resources/**/*.txt</exclude>
+ <exclude>src/test/resources/**/*.rtf</exclude>
<exclude>src/test/resources/**/*.cnd</exclude>
<exclude>repository/**</exclude>
<exclude>*.log</exclude>
Modified: jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractRecord.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractRecord.java?rev=816123&r1=816122&r2=816123&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractRecord.java (original)
+++ jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractRecord.java Thu Sep 17 10:07:34 2009
@@ -39,7 +39,7 @@
import org.apache.jackrabbit.spi.commons.name.PathFactoryImpl;
import org.apache.jackrabbit.spi.commons.namespace.NamespaceMapping;
import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver;
-import org.apache.jackrabbit.spi.commons.nodetype.QItemDefinitionsBuilder;
+import org.apache.jackrabbit.spi.commons.nodetype.QDefinitionBuilderFactory;
import org.apache.jackrabbit.spi.commons.nodetype.compact.CompactNodeTypeDefWriter;
/**
@@ -253,7 +253,7 @@
CompactNodeTypeDefReader<QNodeTypeDefinition, NamespaceMapping> reader =
new CompactNodeTypeDefReader<QNodeTypeDefinition, NamespaceMapping>(
sr, "(internal)", new NamespaceMapping(nsResolver),
- new QItemDefinitionsBuilder());
+ new QDefinitionBuilderFactory());
Collection<QNodeTypeDefinition> ntds = reader.getNodeTypeDefinitions();
if (ntds.size() != 1) {
Modified: jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeDefStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeDefStore.java?rev=816123&r1=816122&r2=816123&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeDefStore.java (original)
+++ jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeDefStore.java Thu Sep 17 10:07:34 2009
@@ -35,7 +35,7 @@
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.QNodeTypeDefinition;
import org.apache.jackrabbit.spi.commons.namespace.NamespaceMapping;
-import org.apache.jackrabbit.spi.commons.nodetype.QItemDefinitionsBuilder;
+import org.apache.jackrabbit.spi.commons.nodetype.QDefinitionBuilderFactory;
/**
* <code>NodeTypeDefStore</code> ...
@@ -80,7 +80,7 @@
try {
CompactNodeTypeDefReader<QNodeTypeDefinition, NamespaceMapping> r =
new CompactNodeTypeDefReader<QNodeTypeDefinition, NamespaceMapping>(
- in, systemId, new QItemDefinitionsBuilder());
+ in, systemId, new QDefinitionBuilderFactory());
for (QNodeTypeDefinition qdef: r.getNodeTypeDefinitions()) {
add(new NodeTypeDef(qdef));
Modified: jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java?rev=816123&r1=816122&r2=816123&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java (original)
+++ jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java Thu Sep 17 10:07:34 2009
@@ -69,7 +69,7 @@
import org.apache.jackrabbit.spi.commons.nodetype.*;
import org.apache.jackrabbit.spi.commons.nodetype.NodeDefinitionImpl;
import org.apache.jackrabbit.spi.commons.nodetype.PropertyDefinitionImpl;
-import org.apache.jackrabbit.spi.commons.nodetype.QItemDefinitionsBuilder;
+import org.apache.jackrabbit.spi.commons.nodetype.QDefinitionBuilderFactory;
import org.apache.jackrabbit.spi.commons.nodetype.constraint.ValueConstraint;
import org.apache.jackrabbit.spi.commons.name.NameConstants;
import org.apache.jackrabbit.spi.commons.QPropertyDefinitionImpl;
@@ -272,7 +272,7 @@
CompactNodeTypeDefReader<QNodeTypeDefinition, NamespaceMapping> reader =
new CompactNodeTypeDefReader<QNodeTypeDefinition, NamespaceMapping>(
new InputStreamReader(in), "cnd input stream", mapping,
- new QItemDefinitionsBuilder());
+ new QDefinitionBuilderFactory());
namespaceMap.putAll(mapping.getPrefixToURIMapping());
for (QNodeTypeDefinition ntDef: reader.getNodeTypeDefinitions()) {
Modified: jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/BLOBFileValue.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/BLOBFileValue.java?rev=816123&r1=816122&r2=816123&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/BLOBFileValue.java (original)
+++ jackrabbit/sandbox/JCR-2170/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/BLOBFileValue.java Thu Sep 17 10:07:34 2009
@@ -78,10 +78,18 @@
public int read(byte[] b, long position) throws IOException, RepositoryException {
InputStream in = getStream();
try {
- in.skip(position);
+ long skip = position;
+ while (skip > 0) {
+ long skipped = in.skip(skip);
+ if (skipped <= 0) {
+ return -1;
+ }
+ skip -= skipped;
+ }
return in.read(b);
} finally {
in.close();
}
}
+
}
Modified: jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/CndImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/CndImporter.java?rev=816123&r1=816122&r2=816123&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/CndImporter.java (original)
+++ jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/CndImporter.java Thu Sep 17 10:07:34 2009
@@ -39,7 +39,7 @@
/**
* Utility class for importing compact node type definitions.
* @see CompactNodeTypeDefReader
- * @see ItemTemplatesBuilder
+ * @see TemplateBuilderFactory
*/
public final class CndImporter {
@@ -105,11 +105,11 @@
UnsupportedRepositoryOperationException, RepositoryException, IOException {
try {
- AbstractItemTypeDefinitionsBuilder<NodeTypeTemplate, NamespaceRegistry> builder =
- new ItemTemplatesBuilder(nodeTypeManager, valueFactory, namespaceRegistry);
+ DefinitionBuilderFactory<NodeTypeTemplate, NamespaceRegistry> factory =
+ new TemplateBuilderFactory(nodeTypeManager, valueFactory, namespaceRegistry);
CompactNodeTypeDefReader<NodeTypeTemplate, NamespaceRegistry> cndReader =
- new CompactNodeTypeDefReader<NodeTypeTemplate, NamespaceRegistry>(cnd, systemId, builder);
+ new CompactNodeTypeDefReader<NodeTypeTemplate, NamespaceRegistry>(cnd, systemId, factory);
List<NodeTypeTemplate> ntts = cndReader.getNodeTypeDefinitions();
Modified: jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/CompactNodeTypeDefReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/CompactNodeTypeDefReader.java?rev=816123&r1=816122&r2=816123&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/CompactNodeTypeDefReader.java (original)
+++ jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/CompactNodeTypeDefReader.java Thu Sep 17 10:07:34 2009
@@ -25,9 +25,9 @@
import javax.jcr.query.qom.QueryObjectModelConstants;
import javax.jcr.version.OnParentVersionAction;
-import org.apache.jackrabbit.commons.cnd.AbstractItemTypeDefinitionsBuilder.AbstractNodeDefinitionBuilder;
-import org.apache.jackrabbit.commons.cnd.AbstractItemTypeDefinitionsBuilder.AbstractNodeTypeDefinitionBuilder;
-import org.apache.jackrabbit.commons.cnd.AbstractItemTypeDefinitionsBuilder.AbstractPropertyDefinitionBuilder;
+import org.apache.jackrabbit.commons.cnd.DefinitionBuilderFactory.AbstractNodeDefinitionBuilder;
+import org.apache.jackrabbit.commons.cnd.DefinitionBuilderFactory.AbstractNodeTypeDefinitionBuilder;
+import org.apache.jackrabbit.commons.cnd.DefinitionBuilderFactory.AbstractPropertyDefinitionBuilder;
/**
* CompactNodeTypeDefReader. Parses node type definitions written in the compact
@@ -37,7 +37,7 @@
* The CompactNodeTypeDefReader is parameterizable in the type of the node type
* definition <code>T</code> and the type of the namespace mapping <code>N</code>
* which the parser should build. For types <code>T</code> and <code>N</code> the
- * parser's constructor takes a {@link AbstractItemTypeDefinitionsBuilder} for
+ * parser's constructor takes a {@link DefinitionBuilderFactory} for
* <code>T</code> and <code>N</code>.
*
* <p/>
@@ -124,20 +124,20 @@
/**
* The builder for QNodeTypeDefinitions
*/
- private final AbstractItemTypeDefinitionsBuilder<T, N> builder;
+ private final DefinitionBuilderFactory<T, N> factory;
/**
* Creates a new CND reader and parses the given stream.
*
* @param r a reader to the CND
* @param systemId a informative id of the given stream
- * @param builder builder for creating new definitions and handling namespaces
+ * @param factory builder for creating new definitions and handling namespaces
* @throws ParseException if an error occurs
*/
public CompactNodeTypeDefReader(Reader r, String systemId,
- AbstractItemTypeDefinitionsBuilder<T, N> builder) throws ParseException {
+ DefinitionBuilderFactory<T, N> factory) throws ParseException {
- this(r, systemId, null, builder);
+ this(r, systemId, null, factory);
}
/**
@@ -146,18 +146,18 @@
* @param r a reader to the CND
* @param systemId a informative id of the given stream
* @param nsMapping default namespace mapping to use
- * @param builder builder for creating new definitions and handling namespaces
+ * @param factory builder for creating new definitions and handling namespaces
* @throws ParseException if an error occurs
*/
public CompactNodeTypeDefReader(Reader r, String systemId, N nsMapping,
- AbstractItemTypeDefinitionsBuilder<T, N> builder) throws ParseException {
+ DefinitionBuilderFactory<T, N> factory) throws ParseException {
super();
- this.builder = builder;
+ this.factory = factory;
lexer = new Lexer(r, systemId);
if (nsMapping != null) {
- builder.setNamespaceMapping(nsMapping);
+ factory.setNamespaceMapping(nsMapping);
}
nextToken();
@@ -187,7 +187,7 @@
* @return
*/
public N getNamespaceMapping() {
- return builder.getNamespaceMapping();
+ return factory.getNamespaceMapping();
}
/**
@@ -203,7 +203,7 @@
}
try {
while (!currentTokenEquals(Lexer.EOF)) {
- AbstractNodeTypeDefinitionBuilder<T> ntd = builder.newNodeTypeDefinitionBuilder();
+ AbstractNodeTypeDefinitionBuilder<T> ntd = factory.newNodeTypeDefinitionBuilder();
ntd.setOrderableChildNodes(false);
ntd.setMixin(false);
ntd.setAbstract(false);
@@ -244,7 +244,7 @@
lexer.fail("Missing > in namespace decl.");
}
try {
- builder.setNamespace(prefix, uri);
+ factory.setNamespace(prefix, uri);
}
catch (RepositoryException e) {
lexer.fail("Error setting namespace mapping " + currentToken, e);
Modified: jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java?rev=816123&r1=816122&r2=816123&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java (original)
+++ jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java Thu Sep 17 10:07:34 2009
@@ -77,7 +77,7 @@
import org.apache.jackrabbit.spi.commons.namespace.NamespaceMapping;
import org.apache.jackrabbit.spi.commons.nodetype.NodeTypeStorage;
import org.apache.jackrabbit.spi.commons.nodetype.NodeTypeStorageImpl;
-import org.apache.jackrabbit.spi.commons.nodetype.QItemDefinitionsBuilder;
+import org.apache.jackrabbit.spi.commons.nodetype.QDefinitionBuilderFactory;
import org.apache.jackrabbit.spi.commons.value.QValueFactoryImpl;
/**
@@ -209,7 +209,7 @@
CompactNodeTypeDefReader<QNodeTypeDefinition, NamespaceMapping> reader;
try {
reader = new CompactNodeTypeDefReader<QNodeTypeDefinition, NamespaceMapping>(cnd, "",
- this.namespaces, new QItemDefinitionsBuilder());
+ this.namespaces, new QDefinitionBuilderFactory());
List<QNodeTypeDefinition> ntds = reader.getNodeTypeDefinitions();
nodeTypeDefs.registerNodeTypes(ntds.toArray(new QNodeTypeDefinition[ntds.size()]), true);
Modified: jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefTest.java?rev=816123&r1=816122&r2=816123&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefTest.java (original)
+++ jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefTest.java Thu Sep 17 10:07:34 2009
@@ -31,7 +31,7 @@
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
import org.apache.jackrabbit.spi.commons.namespace.NamespaceMapping;
import org.apache.jackrabbit.spi.commons.nodetype.NodeTypeDefDiff;
-import org.apache.jackrabbit.spi.commons.nodetype.QItemDefinitionsBuilder;
+import org.apache.jackrabbit.spi.commons.nodetype.QDefinitionBuilderFactory;
public class CompactNodeTypeDefTest extends TestCase {
@@ -43,7 +43,7 @@
Reader reader = new InputStreamReader(getClass().getClassLoader().getResourceAsStream(TEST_FILE));
CompactNodeTypeDefReader<QNodeTypeDefinition, NamespaceMapping> cndReader =
new CompactNodeTypeDefReader<QNodeTypeDefinition, NamespaceMapping>(
- reader, TEST_FILE, new QItemDefinitionsBuilder());
+ reader, TEST_FILE, new QDefinitionBuilderFactory());
List<QNodeTypeDefinition> ntdList1 = cndReader.getNodeTypeDefinitions();
NamespaceMapping nsm = cndReader.getNamespaceMapping();
@@ -55,7 +55,7 @@
// Rerun the reader on the product of the writer
cndReader = new CompactNodeTypeDefReader<QNodeTypeDefinition, NamespaceMapping>(
- new StringReader(sw.toString()), TEST_FILE, new QItemDefinitionsBuilder());
+ new StringReader(sw.toString()), TEST_FILE, new QDefinitionBuilderFactory());
List<QNodeTypeDefinition> ntdList2 = cndReader.getNodeTypeDefinitions();