Author: rhauch Date: 2010-01-08 00:46:48 -0500 (Fri, 08 Jan 2010) New Revision: 1558 Added: trunk/dna-integration-tests/src/test/resources/tck/filesystem/defaultWorkspace/testroot/yetAnotherNode Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/property/basic/JodaDateTimeValueFactory.java trunk/dna-integration-tests/src/test/resources/tck/filesystem/repositoryOverlay.properties trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrQueryManagerTest.java trunk/extensions/dna-search-lucene/src/main/java/org/jboss/dna/search/lucene/LuceneSearchSession.java Log: DNA-613 minor changes to get the FileSystemRepositoryTckTest to run with the newly-added XPath TCK tests. Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/property/basic/JodaDateTimeValueFactory.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/property/basic/JodaDateTimeValueFactory.java 2010-01-08 05:45:54 UTC (rev 1557) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/property/basic/JodaDateTimeValueFactory.java 2010-01-08 05:46:48 UTC (rev 1558) @@ -64,10 +64,17 @@ try { return new JodaDateTime(value.trim()); } catch (IllegalArgumentException err) { - throw new ValueFormatException(value, getPropertyType(), - GraphI18n.errorConvertingType.text(String.class.getSimpleName(), - DateTime.class.getSimpleName(), - value), err); + // See if this string represents a LONG value ... + try { + Long longValue = Long.parseLong(value); + return new JodaDateTime(longValue); + } catch (NumberFormatException e) { + // Guess it wasn't a long value ... + throw new ValueFormatException(value, getPropertyType(), + GraphI18n.errorConvertingType.text(String.class.getSimpleName(), + DateTime.class.getSimpleName(), + value), err); + } } } Added: trunk/dna-integration-tests/src/test/resources/tck/filesystem/defaultWorkspace/testroot/yetAnotherNode =================================================================== --- trunk/dna-integration-tests/src/test/resources/tck/filesystem/defaultWorkspace/testroot/yetAnotherNode (rev 0) +++ trunk/dna-integration-tests/src/test/resources/tck/filesystem/defaultWorkspace/testroot/yetAnotherNode 2010-01-08 05:46:48 UTC (rev 1558) @@ -0,0 +1 @@ +Test content Modified: trunk/dna-integration-tests/src/test/resources/tck/filesystem/repositoryOverlay.properties =================================================================== --- trunk/dna-integration-tests/src/test/resources/tck/filesystem/repositoryOverlay.properties 2010-01-08 05:45:54 UTC (rev 1557) +++ trunk/dna-integration-tests/src/test/resources/tck/filesystem/repositoryOverlay.properties 2010-01-08 05:46:48 UTC (rev 1558) @@ -1,6 +1,7 @@ # Placeholder for any overlaid properties for this repo configuration javax.jcr.tck.dnaSkipImport=true +query.xpath.pos.index=false javax.jcr.tck.nodetype=nt\:folder 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 2010-01-08 05:45:54 UTC (rev 1557) +++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java 2010-01-08 05:46:48 UTC (rev 1558) @@ -392,13 +392,13 @@ * @throws IllegalArgumentException If <code>executionContext</code>, <code>connectionFactory</code>, * <code>repositorySourceName</code>, or <code>repositoryObservable</code> is <code>null</code>. */ - public JcrRepository( ExecutionContext executionContext, - RepositoryConnectionFactory connectionFactory, - String repositorySourceName, - Observable repositoryObservable, - RepositorySourceCapabilities repositorySourceCapabilities, - Map<String, String> descriptors, - Map<Option, String> options ) throws RepositoryException { + JcrRepository( ExecutionContext executionContext, + RepositoryConnectionFactory connectionFactory, + String repositorySourceName, + Observable repositoryObservable, + RepositorySourceCapabilities repositorySourceCapabilities, + Map<String, String> descriptors, + Map<Option, String> options ) throws RepositoryException { CheckArg.isNotNull(executionContext, "executionContext"); CheckArg.isNotNull(connectionFactory, "connectionFactory"); CheckArg.isNotNull(repositorySourceName, "repositorySourceName"); @@ -415,11 +415,17 @@ modifiableDescriptors.put(Repository.LEVEL_2_SUPPORTED, "true"); modifiableDescriptors.put(Repository.OPTION_LOCKING_SUPPORTED, "true"); modifiableDescriptors.put(Repository.OPTION_OBSERVATION_SUPPORTED, "true"); - modifiableDescriptors.put(Repository.OPTION_QUERY_SQL_SUPPORTED, "false"); + modifiableDescriptors.put(Repository.OPTION_QUERY_SQL_SUPPORTED, "false"); // not JCR 1.0 SQL modifiableDescriptors.put(Repository.OPTION_TRANSACTIONS_SUPPORTED, "false"); modifiableDescriptors.put(Repository.OPTION_VERSIONING_SUPPORTED, "false"); - modifiableDescriptors.put(Repository.QUERY_XPATH_DOC_ORDER, "true"); - modifiableDescriptors.put(Repository.QUERY_XPATH_POS_INDEX, "true"); + if (!modifiableDescriptors.containsKey(Repository.QUERY_XPATH_DOC_ORDER)) { + // don't override what was supplied ... + modifiableDescriptors.put(Repository.QUERY_XPATH_DOC_ORDER, "true"); + } + if (!modifiableDescriptors.containsKey(Repository.QUERY_XPATH_POS_INDEX)) { + // don't override what was supplied ... + modifiableDescriptors.put(Repository.QUERY_XPATH_POS_INDEX, "true"); + } // Vendor-specific descriptors (REP_XXX) will only be initialized if not already present, allowing for customer branding. if (!modifiableDescriptors.containsKey(Repository.REP_NAME_DESC)) { modifiableDescriptors.put(Repository.REP_NAME_DESC, JcrI18n.REP_NAME_DESC.text()); Modified: trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrQueryManagerTest.java =================================================================== --- trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrQueryManagerTest.java 2010-01-08 05:45:54 UTC (rev 1557) +++ trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrQueryManagerTest.java 2010-01-08 05:46:48 UTC (rev 1558) @@ -293,7 +293,6 @@ Query query = manager.createQuery("//element(*,nt:unstructured) order by @jcr:primaryType", Query.XPATH); assertThat(query, is(notNullValue())); QueryResult result = query.execute(); - print = true; assertResults(query, result, 21); assertThat(result, is(notNullValue())); assertResultsHaveColumns(result, "jcr:primaryType", "jcr:path", "jcr:score"); @@ -301,7 +300,6 @@ query = manager.createQuery("//element(*,car:Car) order by @car:year", Query.XPATH); assertThat(query, is(notNullValue())); result = query.execute(); - print = true; assertResults(query, result, 12); assertThat(result, is(notNullValue())); assertResultsHaveColumns(result, "car:year", "jcr:path", "jcr:score"); @@ -312,7 +310,6 @@ Query query = session.getWorkspace().getQueryManager().createQuery(" /jcr:root/Cars/Hybrid/*", Query.XPATH); assertThat(query, is(notNullValue())); QueryResult result = query.execute(); - print = true; assertResults(query, result, 3); assertThat(result, is(notNullValue())); assertResultsHaveColumns(result, "jcr:primaryType", "jcr:path", "jcr:score"); @@ -389,7 +386,6 @@ Query query = session.getWorkspace().getQueryManager().createQuery("/jcr:root/Other/NodeA", Query.XPATH); assertThat(query, is(notNullValue())); QueryResult result = query.execute(); - print = true; assertResults(query, result, 1); assertThat(result, is(notNullValue())); assertThat(result.getNodes().nextNode().getIndex(), is(1)); @@ -398,7 +394,6 @@ query = session.getWorkspace().getQueryManager().createQuery("/jcr:root/Other/NodeA[2]", Query.XPATH); assertThat(query, is(notNullValue())); result = query.execute(); - print = true; assertResults(query, result, 1); assertThat(result, is(notNullValue())); assertThat(result.getNodes().nextNode().getIndex(), is(2)); Modified: trunk/extensions/dna-search-lucene/src/main/java/org/jboss/dna/search/lucene/LuceneSearchSession.java =================================================================== --- trunk/extensions/dna-search-lucene/src/main/java/org/jboss/dna/search/lucene/LuceneSearchSession.java 2010-01-08 05:45:54 UTC (rev 1557) +++ trunk/extensions/dna-search-lucene/src/main/java/org/jboss/dna/search/lucene/LuceneSearchSession.java 2010-01-08 05:46:48 UTC (rev 1558) @@ -463,7 +463,6 @@ if (fullTextSearchValue != null && fullTextSearchValue.length() != 0) { doc.add(new Field(ContentIndex.FULL_TEXT, fullTextSearchValue.toString(), Field.Store.NO, Field.Index.ANALYZED)); } - // System.out.println("Replaced " + doc); getContentWriter().updateDocument(new Term(ContentIndex.PATH, pathStr), doc); }