Author: hardy.ferentschik Date: 2009-05-18 09:21:37 -0400 (Mon, 18 May 2009) New Revision: 16587 Modified: search/trunk/hibernate-search-archetype/src/main/resources/archetype-resources/src/main/java/example/Author.java search/trunk/hibernate-search-archetype/src/main/resources/archetype-resources/src/main/java/example/Book.java search/trunk/hibernate-search-archetype/src/main/resources/archetype-resources/src/test/java/java/example/IndexAndSearchTest.java search/trunk/src/main/java/org/hibernate/search/Indexer.java search/trunk/src/main/java/org/hibernate/search/annotations/FilterCacheModeType.java search/trunk/src/main/java/org/hibernate/search/annotations/TermVector.java search/trunk/src/main/java/org/hibernate/search/backend/WorkVisitor.java search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/DpSelectionDelegate.java search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/DpSelectionVisitor.java search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/PerDPQueueProcessor.java search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/PerDPResources.java search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/QueueProcessors.java search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/works/AddWorkDelegate.java search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/works/DeleteExtWorkDelegate.java search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/works/LuceneWorkDelegate.java search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/works/LuceneWorkVisitor.java search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/works/OptimizeWorkDelegate.java search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/works/PurgeAllWorkDelegate.java search/trunk/src/main/java/org/hibernate/search/batchindexing/BatchIndexingWorkspace.java search/trunk/src/main/java/org/hibernate/search/batchindexing/EntityConsumerLuceneworkProducer.java search/trunk/src/main/java/org/hibernate/search/batchindexing/Executors.java search/trunk/src/main/java/org/hibernate/search/batchindexing/IdentifierConsumerEntityProducer.java search/trunk/src/main/java/org/hibernate/search/batchindexing/IdentifierProducer.java search/trunk/src/main/java/org/hibernate/search/batchindexing/IndexWritingJob.java search/trunk/src/main/java/org/hibernate/search/batchindexing/IndexerProgressMonitor.java search/trunk/src/main/java/org/hibernate/search/batchindexing/ProducerConsumerQueue.java search/trunk/src/main/java/org/hibernate/search/bridge/LuceneOptions.java search/trunk/src/main/java/org/hibernate/search/cfg/AnalyzerDefMapping.java search/trunk/src/main/java/org/hibernate/search/cfg/ConcatStringBridge.java search/trunk/src/main/java/org/hibernate/search/cfg/DocumentIdMapping.java search/trunk/src/main/java/org/hibernate/search/cfg/EntityDescriptor.java search/trunk/src/main/java/org/hibernate/search/cfg/EntityMapping.java search/trunk/src/main/java/org/hibernate/search/cfg/FieldBridgeMapping.java search/trunk/src/main/java/org/hibernate/search/cfg/FieldMapping.java search/trunk/src/main/java/org/hibernate/search/cfg/PropertyDescriptor.java search/trunk/src/main/java/org/hibernate/search/cfg/PropertyMapping.java search/trunk/src/main/java/org/hibernate/search/cfg/SearchConfiguration.java search/trunk/src/main/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java search/trunk/src/main/java/org/hibernate/search/cfg/SearchMapping.java search/trunk/src/main/java/org/hibernate/search/cfg/TokenFilterDefMapping.java search/trunk/src/main/java/org/hibernate/search/engine/EntityState.java search/trunk/src/main/java/org/hibernate/search/impl/IndexerImpl.java search/trunk/src/main/java/org/hibernate/search/impl/MappingModelMetadataProvider.java search/trunk/src/main/java/org/hibernate/search/impl/SimpleIndexingProgressMonitor.java search/trunk/src/main/java/org/hibernate/search/impl/SolrAnalyzerBuilder.java search/trunk/src/main/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java search/trunk/src/main/java/org/hibernate/search/util/HibernateSearchResourceLoader.java search/trunk/src/test/java/org/hibernate/search/test/TestCase.java search/trunk/src/test/java/org/hibernate/search/test/analyzer/AlarmEntity.java search/trunk/src/test/java/org/hibernate/search/test/analyzer/DoubleAnalyzerTest.java search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java search/trunk/src/test/java/org/hibernate/search/test/batchindexing/AncientBook.java search/trunk/src/test/java/org/hibernate/search/test/batchindexing/Book.java search/trunk/src/test/java/org/hibernate/search/test/batchindexing/Dvd.java search/trunk/src/test/java/org/hibernate/search/test/batchindexing/ModernBook.java search/trunk/src/test/java/org/hibernate/search/test/batchindexing/SearchIndexerTest.java search/trunk/src/test/java/org/hibernate/search/test/classloading/Animal.java search/trunk/src/test/java/org/hibernate/search/test/classloading/NoAnnotationsTest.java search/trunk/src/test/java/org/hibernate/search/test/configuration/Address.java search/trunk/src/test/java/org/hibernate/search/test/configuration/Country.java search/trunk/src/test/java/org/hibernate/search/test/configuration/ProgrammaticMappingTest.java search/trunk/src/test/java/org/hibernate/search/test/configuration/User.java search/trunk/src/test/java/org/hibernate/search/test/directoryProvider/CustomLockFactoryFactory.java search/trunk/src/test/java/org/hibernate/search/test/directoryProvider/CustomLockProviderTest.java search/trunk/src/test/java/org/hibernate/search/test/embedded/NonIndexedEntity.java search/trunk/src/test/java/org/hibernate/search/test/embedded/StateCandidate.java search/trunk/src/test/java/org/hibernate/search/test/engine/EventListenerSerializationTest.java search/trunk/src/test/java/org/hibernate/search/test/filter/AndDocIdSetsTest.java search/trunk/src/test/java/org/hibernate/search/test/filter/FiltersOptimizationTest.java search/trunk/src/test/java/org/hibernate/search/test/filter/InstanceBasedExcludeAllFilter.java search/trunk/src/test/java/org/hibernate/search/test/id/Animal.java search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPersonSub.java search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdTest.java search/trunk/src/test/java/org/hibernate/search/test/inheritance/Eagle.java search/trunk/src/test/java/org/hibernate/search/test/query/ElectricalProperties.java search/trunk/src/test/java/org/hibernate/search/test/worker/duplication/EmailAddress.java search/trunk/src/test/java/org/hibernate/search/test/worker/duplication/Person.java search/trunk/src/test/java/org/hibernate/search/test/worker/duplication/SpecialPerson.java search/trunk/src/test/java/org/hibernate/search/test/worker/duplication/WorkSequencesTest.java Log: Enabled keyword substitution Property changes on: search/trunk/hibernate-search-archetype/src/main/resources/archetype-resources/src/main/java/example/Author.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/hibernate-search-archetype/src/main/resources/archetype-resources/src/main/java/example/Book.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/hibernate-search-archetype/src/main/resources/archetype-resources/src/test/java/java/example/IndexAndSearchTest.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/Indexer.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/annotations/FilterCacheModeType.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/annotations/TermVector.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/WorkVisitor.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/DpSelectionDelegate.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/DpSelectionVisitor.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/PerDPQueueProcessor.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/PerDPResources.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/QueueProcessors.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/works/AddWorkDelegate.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/works/DeleteExtWorkDelegate.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/works/LuceneWorkDelegate.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/works/LuceneWorkVisitor.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/works/OptimizeWorkDelegate.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/works/PurgeAllWorkDelegate.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/batchindexing/BatchIndexingWorkspace.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/batchindexing/EntityConsumerLuceneworkProducer.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/batchindexing/Executors.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/batchindexing/IdentifierConsumerEntityProducer.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/batchindexing/IdentifierProducer.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/batchindexing/IndexWritingJob.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/batchindexing/IndexerProgressMonitor.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/batchindexing/ProducerConsumerQueue.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/bridge/LuceneOptions.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/cfg/AnalyzerDefMapping.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/cfg/ConcatStringBridge.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/cfg/DocumentIdMapping.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/cfg/EntityDescriptor.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/cfg/EntityMapping.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/cfg/FieldBridgeMapping.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/cfg/FieldMapping.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/cfg/PropertyDescriptor.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/cfg/PropertyMapping.java ___________________________________________________________________ Name: svn:keywords + Id Modified: search/trunk/src/main/java/org/hibernate/search/cfg/SearchConfiguration.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/cfg/SearchConfiguration.java 2009-05-18 13:18:59 UTC (rev 16586) +++ search/trunk/src/main/java/org/hibernate/search/cfg/SearchConfiguration.java 2009-05-18 13:21:37 UTC (rev 16587) @@ -1,4 +1,4 @@ -// $Id: SearchConfiguration.java 14954 2008-07-17 20:43:10Z sannegrinovero $ +// $Id$ package org.hibernate.search.cfg; import java.util.Iterator; Property changes on: search/trunk/src/main/java/org/hibernate/search/cfg/SearchConfiguration.java ___________________________________________________________________ Name: svn:keywords + Id Modified: search/trunk/src/main/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java 2009-05-18 13:18:59 UTC (rev 16586) +++ search/trunk/src/main/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java 2009-05-18 13:21:37 UTC (rev 16587) @@ -1,4 +1,4 @@ -// $Id: SearchConfigurationFromHibernateCore.java 14954 2008-07-17 20:43:10Z sannegrinovero $ +// $Id$ package org.hibernate.search.cfg; import java.util.Iterator; Property changes on: search/trunk/src/main/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/cfg/SearchMapping.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/cfg/TokenFilterDefMapping.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/engine/EntityState.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/impl/IndexerImpl.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/impl/MappingModelMetadataProvider.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/impl/SimpleIndexingProgressMonitor.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/impl/SolrAnalyzerBuilder.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/main/java/org/hibernate/search/util/HibernateSearchResourceLoader.java ___________________________________________________________________ Name: svn:keywords + Id Modified: search/trunk/src/test/java/org/hibernate/search/test/TestCase.java =================================================================== --- search/trunk/src/test/java/org/hibernate/search/test/TestCase.java 2009-05-18 13:18:59 UTC (rev 16586) +++ search/trunk/src/test/java/org/hibernate/search/test/TestCase.java 2009-05-18 13:21:37 UTC (rev 16587) @@ -1,4 +1,4 @@ -//$Id: HANTestCase.java 14687 2008-05-22 18:21:01Z epbernard $ +//$Id$ package org.hibernate.search.test; import java.io.InputStream; Property changes on: search/trunk/src/test/java/org/hibernate/search/test/TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/analyzer/AlarmEntity.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/analyzer/DoubleAnalyzerTest.java ___________________________________________________________________ Name: svn:keywords + Id Modified: search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java =================================================================== --- search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java 2009-05-18 13:18:59 UTC (rev 16586) +++ search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java 2009-05-18 13:21:37 UTC (rev 16587) @@ -1,4 +1,4 @@ -// $Id: AbstractTestAnalyzer.java 15547 2008-11-11 12:57:47Z hardy.ferentschik $ +// $Id$ package org.hibernate.search.test.analyzer.solr; import java.io.IOException; Property changes on: search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/batchindexing/AncientBook.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/batchindexing/Book.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/batchindexing/Dvd.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/batchindexing/ModernBook.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/batchindexing/SearchIndexerTest.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/classloading/Animal.java ___________________________________________________________________ Name: svn:keywords + Id Modified: search/trunk/src/test/java/org/hibernate/search/test/classloading/NoAnnotationsTest.java =================================================================== --- search/trunk/src/test/java/org/hibernate/search/test/classloading/NoAnnotationsTest.java 2009-05-18 13:18:59 UTC (rev 16586) +++ search/trunk/src/test/java/org/hibernate/search/test/classloading/NoAnnotationsTest.java 2009-05-18 13:21:37 UTC (rev 16587) @@ -1,4 +1,4 @@ -// $Id: NoAnnotationsTest.java 15532 2008-11-07 16:06:17Z hardy.ferentschik $ +// $Id$ package org.hibernate.search.test.classloading; import java.util.List; Property changes on: search/trunk/src/test/java/org/hibernate/search/test/classloading/NoAnnotationsTest.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/configuration/Address.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/configuration/Country.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/configuration/ProgrammaticMappingTest.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/configuration/User.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/directoryProvider/CustomLockFactoryFactory.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/directoryProvider/CustomLockProviderTest.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/embedded/NonIndexedEntity.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/embedded/StateCandidate.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/engine/EventListenerSerializationTest.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/filter/AndDocIdSetsTest.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/filter/FiltersOptimizationTest.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/filter/InstanceBasedExcludeAllFilter.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/id/Animal.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPersonSub.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdTest.java ___________________________________________________________________ Name: svn:keywords + Id Modified: search/trunk/src/test/java/org/hibernate/search/test/inheritance/Eagle.java =================================================================== --- search/trunk/src/test/java/org/hibernate/search/test/inheritance/Eagle.java 2009-05-18 13:18:59 UTC (rev 16586) +++ search/trunk/src/test/java/org/hibernate/search/test/inheritance/Eagle.java 2009-05-18 13:21:37 UTC (rev 16587) @@ -1,4 +1,4 @@ -//$Id: Fish.java 15592 2008-11-19 14:17:48Z hardy.ferentschik $ +//$Id$ package org.hibernate.search.test.inheritance; import javax.persistence.Entity; Property changes on: search/trunk/src/test/java/org/hibernate/search/test/inheritance/Eagle.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/query/ElectricalProperties.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/worker/duplication/EmailAddress.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/worker/duplication/Person.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/worker/duplication/SpecialPerson.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: search/trunk/src/test/java/org/hibernate/search/test/worker/duplication/WorkSequencesTest.java ___________________________________________________________________ Name: svn:keywords + Id