diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index 3771fe1f1..2e533e388 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -1,280 +1,257 @@ - - 4.0.0 - alfresco-search - Alfresco Solr Search - jar - - org.alfresco - alfresco-search-parent - 1.2.0-SNAPSHOT - ../pom.xml - - - - - - org.alfresco - alfresco-solrclient - ${alfresco-solrclient.version} - - - servlet-api - javax.servlet - - - - - - - org.apache.lucene - lucene-analyzers-common - ${solr.version} - provided - - - - org.apache.solr - solr-core - ${solr.version} - provided - - - jdk.tools - jdk.tools - - - - - - org.apache.solr - solr-analysis-extras - ${solr.version} - provided - - - - org.apache.solr - solr-langid - ${solr.version} - provided - - - xercesImpl - xerces - - - - - - org.apache.solr - solr-clustering - ${solr.version} - provided - - - - org.slf4j - slf4j-api - 1.7.12 - - - - org.slf4j - slf4j-log4j12 - 1.7.12 - - - - - junit - junit - 4.12 - test - - - - org.mockito - mockito-all - 1.10.19 - test - - - - org.apache.solr - solr-test-framework - ${solr.version} - test - - - com.carrotsearch.randomizedtesting - randomizedtesting-runner - 2.5.0 - test - - - org.apache.chemistry.opencmis - chemistry-opencmis-client-impl - 0.11.0 - test - - - - - edu.emory.mathcs.nlp - nlp4j - 1.1.2 - test - - - - edu.emory.mathcs.nlp - nlp4j-english - 1.1.2 - test - - - - - alfresco-solr - - - maven-surefire-plugin - - - **/*Suite.java - **/*Test.java - - - **/CMISDataCreatorTest.java - - - - - maven-resources-plugin - - - copy-production-config - generate-test-resources - - copy-resources - - - ${project.build.testOutputDirectory}/test-files - - - src/main/resources/solr/instance - - - - - - default-testResources - - true - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - write-alfresco-version - prepare-package - - run - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - prepare-package - - copy-dependencies - - - ${project.build.outputDirectory}/libs - compile - false - false - true - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - default-jar - - - libs/**/* - webapp/**/* - - - - - package-libs - package - - jar - - - libs - - solr/**/* - org/**/* - **/jetty-*.jar - **/slf4j*.jar - **/log4j*.jar - **/junit*.jar - **/mock*.jar - **/opencmis*.jar - **/metrics*.jar - **/gmetric*.jar - - - - - create-test-jar - - test-jar - - - - - - maven-source-plugin - - - attach-sources - - jar - - - - - - - + + 4.0.0 + alfresco-search + Alfresco Solr Search + jar + + org.alfresco + alfresco-search-parent + 1.2.0-SNAPSHOT + ../pom.xml + + + + + + org.alfresco + alfresco-solrclient + ${alfresco-solrclient.version} + + + servlet-api + javax.servlet + + + + + + + org.apache.lucene + lucene-analyzers-common + ${solr.version} + provided + + + + org.apache.solr + solr-core + ${solr.version} + provided + + + jdk.tools + jdk.tools + + + + + + org.apache.solr + solr-analysis-extras + ${solr.version} + provided + + + + org.apache.solr + solr-langid + ${solr.version} + provided + + + xercesImpl + xerces + + + + + + org.apache.solr + solr-clustering + ${solr.version} + provided + + + + org.slf4j + slf4j-api + 1.7.12 + + + + org.slf4j + slf4j-log4j12 + 1.7.12 + + + + + junit + junit + 4.12 + test + + + + org.mockito + mockito-all + 1.10.19 + test + + + + org.apache.solr + solr-test-framework + ${solr.version} + test + + + com.carrotsearch.randomizedtesting + randomizedtesting-runner + 2.5.0 + test + + + org.apache.chemistry.opencmis + chemistry-opencmis-client-impl + 0.11.0 + test + + + + + edu.emory.mathcs.nlp + nlp4j + 1.1.2 + test + + + + edu.emory.mathcs.nlp + nlp4j-english + 1.1.2 + test + + + + + alfresco-solr + + + maven-surefire-plugin + + + **/*Suite.java + **/*Test.java + + + **/CMISDataCreatorTest.java + + + + + maven-resources-plugin + + + copy-production-config + generate-test-resources + + copy-resources + + + ${project.build.testOutputDirectory}/test-files + + + src/main/resources/solr/instance + + + + + + default-testResources + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + prepare-package + + copy-dependencies + + + ${project.build.outputDirectory}/libs + compile + false + false + true + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + default-jar + + + libs/**/* + webapp/**/* + + + + + package-libs + package + + jar + + + libs + + solr/**/* + org/**/* + **/jetty-*.jar + **/slf4j*.jar + **/log4j*.jar + **/junit*.jar + **/mock*.jar + **/opencmis*.jar + **/metrics*.jar + **/gmetric*.jar + + + + + create-test-jar + + test-jar + + + + + + maven-source-plugin + + + attach-sources + + jar + + + + + + + diff --git a/search-services/alfresco-search/src/main/resources/solr/instance/templates/aps/process/conf/solrcore.properties b/search-services/alfresco-search/src/main/resources/solr/instance/templates/aps/process/conf/solrcore.properties index 4c470610d..8fd7d14ed 100644 --- a/search-services/alfresco-search/src/main/resources/solr/instance/templates/aps/process/conf/solrcore.properties +++ b/search-services/alfresco-search/src/main/resources/solr/instance/templates/aps/process/conf/solrcore.properties @@ -4,11 +4,6 @@ enable.alfresco.tracking=true -# -# Alfresco version -# -alfresco.version=5.1 - # #These are replaced by the admin handler # @@ -31,7 +26,7 @@ alfresco.cron=0/10 * * * * ? * alfresco.lag=1000 alfresco.hole.retention=3600000 # alfresco.hole.check.after is not used yet -# It will reduce the hole checking load +# It will reduce the hole checking load alfresco.hole.check.after=300000 alfresco.batch.count=5000 alfresco.recordUnindexedNodes=false @@ -127,7 +122,7 @@ solr.queryResultWindowSize=512 # locale expansion # logging check report .... # -# +# alfresco.doPermissionChecks=true diff --git a/search-services/alfresco-search/src/main/resources/solr/instance/templates/aps/processDefinition/conf/solrcore.properties b/search-services/alfresco-search/src/main/resources/solr/instance/templates/aps/processDefinition/conf/solrcore.properties index 4c470610d..8fd7d14ed 100644 --- a/search-services/alfresco-search/src/main/resources/solr/instance/templates/aps/processDefinition/conf/solrcore.properties +++ b/search-services/alfresco-search/src/main/resources/solr/instance/templates/aps/processDefinition/conf/solrcore.properties @@ -4,11 +4,6 @@ enable.alfresco.tracking=true -# -# Alfresco version -# -alfresco.version=5.1 - # #These are replaced by the admin handler # @@ -31,7 +26,7 @@ alfresco.cron=0/10 * * * * ? * alfresco.lag=1000 alfresco.hole.retention=3600000 # alfresco.hole.check.after is not used yet -# It will reduce the hole checking load +# It will reduce the hole checking load alfresco.hole.check.after=300000 alfresco.batch.count=5000 alfresco.recordUnindexedNodes=false @@ -127,7 +122,7 @@ solr.queryResultWindowSize=512 # locale expansion # logging check report .... # -# +# alfresco.doPermissionChecks=true diff --git a/search-services/alfresco-search/src/main/resources/solr/instance/templates/aps/task/conf/solrcore.properties b/search-services/alfresco-search/src/main/resources/solr/instance/templates/aps/task/conf/solrcore.properties index 4c470610d..8fd7d14ed 100644 --- a/search-services/alfresco-search/src/main/resources/solr/instance/templates/aps/task/conf/solrcore.properties +++ b/search-services/alfresco-search/src/main/resources/solr/instance/templates/aps/task/conf/solrcore.properties @@ -4,11 +4,6 @@ enable.alfresco.tracking=true -# -# Alfresco version -# -alfresco.version=5.1 - # #These are replaced by the admin handler # @@ -31,7 +26,7 @@ alfresco.cron=0/10 * * * * ? * alfresco.lag=1000 alfresco.hole.retention=3600000 # alfresco.hole.check.after is not used yet -# It will reduce the hole checking load +# It will reduce the hole checking load alfresco.hole.check.after=300000 alfresco.batch.count=5000 alfresco.recordUnindexedNodes=false @@ -127,7 +122,7 @@ solr.queryResultWindowSize=512 # locale expansion # logging check report .... # -# +# alfresco.doPermissionChecks=true diff --git a/search-services/alfresco-search/src/main/resources/solr/instance/templates/aps/taskDefinition/conf/solrcore.properties b/search-services/alfresco-search/src/main/resources/solr/instance/templates/aps/taskDefinition/conf/solrcore.properties index 4c470610d..8fd7d14ed 100644 --- a/search-services/alfresco-search/src/main/resources/solr/instance/templates/aps/taskDefinition/conf/solrcore.properties +++ b/search-services/alfresco-search/src/main/resources/solr/instance/templates/aps/taskDefinition/conf/solrcore.properties @@ -4,11 +4,6 @@ enable.alfresco.tracking=true -# -# Alfresco version -# -alfresco.version=5.1 - # #These are replaced by the admin handler # @@ -31,7 +26,7 @@ alfresco.cron=0/10 * * * * ? * alfresco.lag=1000 alfresco.hole.retention=3600000 # alfresco.hole.check.after is not used yet -# It will reduce the hole checking load +# It will reduce the hole checking load alfresco.hole.check.after=300000 alfresco.batch.count=5000 alfresco.recordUnindexedNodes=false @@ -127,7 +122,7 @@ solr.queryResultWindowSize=512 # locale expansion # logging check report .... # -# +# alfresco.doPermissionChecks=true diff --git a/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrcore.properties b/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrcore.properties index 321807868..9fec43c0e 100644 --- a/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrcore.properties +++ b/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrcore.properties @@ -1,186 +1,181 @@ -# -# solrcore.properties - used in solrconfig.xml -# - -enable.alfresco.tracking=true - -# -# Alfresco version -# -alfresco.version=5.1 - -# -#These are replaced by the admin handler -# -#data.dir.root=DATA_DIR -#data.dir.store=workspace/SpacesStore -#alfresco.stores=workspace://SpacesStore - -# -# Properties loaded during alfresco tracking -# - -alfresco.host=localhost -alfresco.port=8080 -alfresco.port.ssl=8443 -alfresco.baseUrl=/alfresco - -#alfresco.index.transformContent=false -#alfresco.ignore.datatype.1=d:content -alfresco.lag=1000 -alfresco.hole.retention=3600000 -# alfresco.hole.check.after is not used yet -# It will reduce the hole checking load -alfresco.hole.check.after=300000 -alfresco.batch.count=5000 -alfresco.recordUnindexedNodes=false - -# encryption - -# none, https -alfresco.secureComms=none - -# ssl -alfresco.encryption.ssl.keystore.type=JCEKS -alfresco.encryption.ssl.keystore.provider= -alfresco.encryption.ssl.keystore.location=ssl.repo.client.keystore -alfresco.encryption.ssl.keystore.passwordFileLocation=ssl-keystore-passwords.properties -alfresco.encryption.ssl.truststore.type=JCEKS -alfresco.encryption.ssl.truststore.provider= -alfresco.encryption.ssl.truststore.location=ssl.repo.client.truststore -alfresco.encryption.ssl.truststore.passwordFileLocation=ssl-truststore-passwords.properties - -# Default Tracker -alfresco.cron=0/10 * * * * ? * -alfresco.corePoolSize=8 -alfresco.maximumPoolSize=-1 -alfresco.keepAliveTime=120 -alfresco.threadPriority=5 -alfresco.threadDaemon=true -alfresco.workQueueSize=-1 -alfresco.commitInterval=2000 -alfresco.newSearcherInterval=3000 -#ACL tracker configuration -#alfresco.acl.tracker.cron= -#alfresco.acl.tracker.corePoolSize= -#alfresco.acl.tracker.maximumPoolSize= -#alfresco.acl.tracker.keepAliveTime= -#alfresco.acl.tracker.threadPriority= -#alfresco.acl.tracker.threadDaemon= -#alfresco.acl.tracker.workQueueSize= -#Content tracker config -#alfresco.content.tracker.cron= -#alfresco.content.tracker.corePoolSize= -#alfresco.content.tracker.maximumPoolSize= -#alfresco.content.tracker.keepAliveTime= -#alfresco.content.tracker.threadPriority= -#alfresco.content.tracker.threadDaemon= -#alfresco.content.tracker.workQueueSize= -#Metadata tracker config -#alfresco.metadata.tracker.cron= -#alfresco.metadata.tracker.corePoolSize= -#alfresco.metadata.tracker.maximumPoolSize= -#alfresco.metadata.tracker.keepAliveTime= -#alfresco.metadata.tracker.threadPriority= -#alfresco.metadata.tracker.threadDaemon= -#alfresco.metadata.tracker.workQueueSize= - - - -# HTTP Client - -alfresco.maxTotalConnections=200 -alfresco.maxHostConnections=200 -alfresco.socketTimeout=360000 - -# SOLR caching - -solr.filterCache.size=256 -solr.filterCache.initialSize=128 -solr.queryResultCache.size=1024 -solr.queryResultCache.initialSize=1024 -solr.documentCache.size=1024 -solr.documentCache.initialSize=1024 -solr.queryResultMaxDocsCached=2048 - -solr.authorityCache.size=128 -solr.authorityCache.initialSize=64 -solr.pathCache.size=256 -solr.pathCache.initialSize=128 - -solr.ownerCache.size=128 -solr.ownerCache.initialSize=64 - -solr.readerCache.size=128 -solr.readerCache.initialSize=64 - -solr.deniedCache.size=128 -solr.deniedCache.initialSize=64 - -# SOLR - -solr.maxBooleanClauses=10000 - -# Batch fetch - -alfresco.transactionDocsBatchSize=500 -alfresco.nodeBatchSize=100 -alfresco.changeSetAclsBatchSize=500 -alfresco.aclBatchSize=100 -alfresco.contentReadBatchSize=100 -alfresco.contentUpdateBatchSize=1000 - -# Warming - -solr.filterCache.autowarmCount=32 -solr.authorityCache.autowarmCount=4 -solr.pathCache.autowarmCount=32 -solr.deniedCache.autowarmCount=0 -solr.readerCache.autowarmCount=0 -solr.ownerCache.autowarmCount=0 -solr.queryResultCache.autowarmCount=4 -solr.documentCache.autowarmCount=512 - -solr.queryResultWindowSize=512 - - -# -# TODO -# -# cross language support -# locale expansion -# logging check report .... -# -# - - -alfresco.doPermissionChecks=true - -# Evaluate permissions as a PostFilter. Setting this to false will evaluate permissions as a Query. - -alfresco.postfilter=true - -# -# Metadata pulling control -# -alfresco.metadata.skipDescendantDocsForSpecificTypes=false -alfresco.metadata.ignore.datatype.0=cm:person -alfresco.metadata.ignore.datatype.1=app:configurations -alfresco.metadata.skipDescendantDocsForSpecificAspects=false -#alfresco.metadata.ignore.aspect.0= - -alfresco.topTermSpanRewriteLimit=1000 - -# -# Suggestions -# -solr.suggester.enabled=true -# -1 to disable suggester build throttling -solr.suggester.minSecsBetweenBuilds=3600 - -# -# Limit the maximum text size of transformed content sent to the index - in bytes -# -alfresco.contentStreamLimit=10000000 -#Shard setup -shard.method=DB_ID +# +# solrcore.properties - used in solrconfig.xml +# + +enable.alfresco.tracking=true + +# +#These are replaced by the admin handler +# +#data.dir.root=DATA_DIR +#data.dir.store=workspace/SpacesStore +#alfresco.stores=workspace://SpacesStore + +# +# Properties loaded during alfresco tracking +# + +alfresco.host=localhost +alfresco.port=8080 +alfresco.port.ssl=8443 +alfresco.baseUrl=/alfresco + +#alfresco.index.transformContent=false +#alfresco.ignore.datatype.1=d:content +alfresco.lag=1000 +alfresco.hole.retention=3600000 +# alfresco.hole.check.after is not used yet +# It will reduce the hole checking load +alfresco.hole.check.after=300000 +alfresco.batch.count=5000 +alfresco.recordUnindexedNodes=false + +# encryption + +# none, https +alfresco.secureComms=none + +# ssl +alfresco.encryption.ssl.keystore.type=JCEKS +alfresco.encryption.ssl.keystore.provider= +alfresco.encryption.ssl.keystore.location=ssl.repo.client.keystore +alfresco.encryption.ssl.keystore.passwordFileLocation=ssl-keystore-passwords.properties +alfresco.encryption.ssl.truststore.type=JCEKS +alfresco.encryption.ssl.truststore.provider= +alfresco.encryption.ssl.truststore.location=ssl.repo.client.truststore +alfresco.encryption.ssl.truststore.passwordFileLocation=ssl-truststore-passwords.properties + +# Default Tracker +alfresco.cron=0/10 * * * * ? * +alfresco.corePoolSize=8 +alfresco.maximumPoolSize=-1 +alfresco.keepAliveTime=120 +alfresco.threadPriority=5 +alfresco.threadDaemon=true +alfresco.workQueueSize=-1 +alfresco.commitInterval=2000 +alfresco.newSearcherInterval=3000 +#ACL tracker configuration +#alfresco.acl.tracker.cron= +#alfresco.acl.tracker.corePoolSize= +#alfresco.acl.tracker.maximumPoolSize= +#alfresco.acl.tracker.keepAliveTime= +#alfresco.acl.tracker.threadPriority= +#alfresco.acl.tracker.threadDaemon= +#alfresco.acl.tracker.workQueueSize= +#Content tracker config +#alfresco.content.tracker.cron= +#alfresco.content.tracker.corePoolSize= +#alfresco.content.tracker.maximumPoolSize= +#alfresco.content.tracker.keepAliveTime= +#alfresco.content.tracker.threadPriority= +#alfresco.content.tracker.threadDaemon= +#alfresco.content.tracker.workQueueSize= +#Metadata tracker config +#alfresco.metadata.tracker.cron= +#alfresco.metadata.tracker.corePoolSize= +#alfresco.metadata.tracker.maximumPoolSize= +#alfresco.metadata.tracker.keepAliveTime= +#alfresco.metadata.tracker.threadPriority= +#alfresco.metadata.tracker.threadDaemon= +#alfresco.metadata.tracker.workQueueSize= + + + +# HTTP Client + +alfresco.maxTotalConnections=200 +alfresco.maxHostConnections=200 +alfresco.socketTimeout=360000 + +# SOLR caching + +solr.filterCache.size=256 +solr.filterCache.initialSize=128 +solr.queryResultCache.size=1024 +solr.queryResultCache.initialSize=1024 +solr.documentCache.size=1024 +solr.documentCache.initialSize=1024 +solr.queryResultMaxDocsCached=2048 + +solr.authorityCache.size=128 +solr.authorityCache.initialSize=64 +solr.pathCache.size=256 +solr.pathCache.initialSize=128 + +solr.ownerCache.size=128 +solr.ownerCache.initialSize=64 + +solr.readerCache.size=128 +solr.readerCache.initialSize=64 + +solr.deniedCache.size=128 +solr.deniedCache.initialSize=64 + +# SOLR + +solr.maxBooleanClauses=10000 + +# Batch fetch + +alfresco.transactionDocsBatchSize=500 +alfresco.nodeBatchSize=100 +alfresco.changeSetAclsBatchSize=500 +alfresco.aclBatchSize=100 +alfresco.contentReadBatchSize=100 +alfresco.contentUpdateBatchSize=1000 + +# Warming + +solr.filterCache.autowarmCount=32 +solr.authorityCache.autowarmCount=4 +solr.pathCache.autowarmCount=32 +solr.deniedCache.autowarmCount=0 +solr.readerCache.autowarmCount=0 +solr.ownerCache.autowarmCount=0 +solr.queryResultCache.autowarmCount=4 +solr.documentCache.autowarmCount=512 + +solr.queryResultWindowSize=512 + + +# +# TODO +# +# cross language support +# locale expansion +# logging check report .... +# +# + + +alfresco.doPermissionChecks=true + +# Evaluate permissions as a PostFilter. Setting this to false will evaluate permissions as a Query. + +alfresco.postfilter=true + +# +# Metadata pulling control +# +alfresco.metadata.skipDescendantDocsForSpecificTypes=false +alfresco.metadata.ignore.datatype.0=cm:person +alfresco.metadata.ignore.datatype.1=app:configurations +alfresco.metadata.skipDescendantDocsForSpecificAspects=false +#alfresco.metadata.ignore.aspect.0= + +alfresco.topTermSpanRewriteLimit=1000 + +# +# Suggestions +# +solr.suggester.enabled=true +# -1 to disable suggester build throttling +solr.suggester.minSecsBetweenBuilds=3600 + +# +# Limit the maximum text size of transformed content sent to the index - in bytes +# +alfresco.contentStreamLimit=10000000 +#Shard setup +shard.method=DB_ID diff --git a/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerankWithQueryLog/qlog/conf/solrcore.properties b/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerankWithQueryLog/qlog/conf/solrcore.properties index 6184c31f5..5325502c2 100644 --- a/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerankWithQueryLog/qlog/conf/solrcore.properties +++ b/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerankWithQueryLog/qlog/conf/solrcore.properties @@ -4,11 +4,6 @@ enable.alfresco.tracking=false -# -# Alfresco version -# -alfresco.version=5.1 - # #These are replaced by the admin handler # @@ -31,7 +26,7 @@ alfresco.cron=0/15 * * * * ? * alfresco.lag=1000 alfresco.hole.retention=3600000 # alfresco.hole.check.after is not used yet -# It will reduce the hole checking load +# It will reduce the hole checking load alfresco.hole.check.after=300000 alfresco.batch.count=1000 alfresco.recordUnindexedNodes=false @@ -124,7 +119,7 @@ solr.queryResultWindowSize=512 # locale expansion # logging check report .... # -# +# alfresco.doPermissionChecks=true diff --git a/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerankWithQueryLog/rerank/conf/solrcore.properties b/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerankWithQueryLog/rerank/conf/solrcore.properties index c611ff17a..bf7e382d7 100644 --- a/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerankWithQueryLog/rerank/conf/solrcore.properties +++ b/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerankWithQueryLog/rerank/conf/solrcore.properties @@ -4,11 +4,6 @@ enable.alfresco.tracking=true -# -# Alfresco version -# -alfresco.version=5.1 - # #These are replaced by the admin handler # @@ -31,7 +26,7 @@ alfresco.cron=0/15 * * * * ? * alfresco.lag=1000 alfresco.hole.retention=3600000 # alfresco.hole.check.after is not used yet -# It will reduce the hole checking load +# It will reduce the hole checking load alfresco.hole.check.after=300000 alfresco.batch.count=1000 alfresco.recordUnindexedNodes=false @@ -127,7 +122,7 @@ solr.queryResultWindowSize=512 # locale expansion # logging check report .... # -# +# alfresco.doPermissionChecks=true diff --git a/search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrcore.properties b/search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrcore.properties index 00fd5fce9..aa07843d0 100644 --- a/search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrcore.properties +++ b/search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrcore.properties @@ -1,159 +1,154 @@ -# -# solrcore.properties - used in solrconfig.xml -# - -enable.alfresco.tracking=true - -# -# Alfresco version -# -alfresco.version=5.1 - -# -#These are replaced by the admin handler -# -#data.dir.root=DATA_DIR -#data.dir.store=workspace/SpacesStore -#alfresco.stores=workspace://SpacesStore - -# -# Properties loaded during alfresco tracking -# - -alfresco.host=localhost -alfresco.port=8080 -alfresco.port.ssl=8443 -alfresco.baseUrl=/alfresco -alfresco.cron=0/2 * * * * ? * - -#alfresco.index.transformContent=false -#alfresco.ignore.datatype.1=d:content -alfresco.lag=1000 -alfresco.hole.retention=3600000 -# alfresco.hole.check.after is not used yet -# It will reduce the hole checking load -alfresco.hole.check.after=300000 -alfresco.batch.count=1000 - -# encryption - -# none, https -alfresco.secureComms=none - -# ssl -alfresco.encryption.ssl.keystore.type=JCEKS -alfresco.encryption.ssl.keystore.provider= -alfresco.encryption.ssl.keystore.location=ssl.repo.client.keystore -alfresco.encryption.ssl.keystore.passwordFileLocation=ssl-keystore-passwords.properties -alfresco.encryption.ssl.truststore.type=JCEKS -alfresco.encryption.ssl.truststore.provider= -alfresco.encryption.ssl.truststore.location=ssl.repo.client.truststore -alfresco.encryption.ssl.truststore.passwordFileLocation=ssl-truststore-passwords.properties - -# Tracking - -alfresco.corePoolSize=1 -alfresco.maximumPoolSize=-1 -alfresco.keepAliveTime=120 -alfresco.threadPriority=5 -alfresco.threadDaemon=true -alfresco.workQueueSize=-1 - -# HTTP Client - -alfresco.maxTotalConnections=200 -alfresco.maxHostConnections=200 -alfresco.socketTimeout=360000 - -# SOLR caching - -solr.filterCache.size=256 -solr.filterCache.initialSize=128 -solr.queryResultCache.size=1024 -solr.queryResultCache.initialSize=1024 -solr.documentCache.size=1024 -solr.documentCache.initialSize=1024 -solr.queryResultMaxDocsCached=2048 - -solr.authorityCache.size=128 -solr.authorityCache.initialSize=64 -solr.pathCache.size=256 -solr.pathCache.initialSize=128 - -solr.ownerCache.size=128 -solr.ownerCache.initialSize=64 - -solr.readerCache.size=128 -solr.readerCache.initialSize=64 - -solr.deniedCache.size=128 -solr.deniedCache.initialSize=64 - -# SOLR - -solr.maxBooleanClauses=10000 - -# Batch fetch - -alfresco.transactionDocsBatchSize=100 -alfresco.nodeBatchSize=10 -alfresco.changeSetAclsBatchSize=100 -alfresco.aclBatchSize=10 -alfresco.contentReadBatchSize=4000 -alfresco.contentUpdateBatchSize=1000 - -# Warming - -solr.filterCache.autowarmCount=32 -solr.authorityCache.autowarmCount=4 -solr.pathCache.autowarmCount=32 -solr.deniedCache.autowarmCount=0 -solr.readerCache.autowarmCount=0 -solr.ownerCache.autowarmCount=0 -solr.queryResultCache.autowarmCount=4 -solr.documentCache.autowarmCount=512 - -solr.queryResultWindowSize=512 - - -# -# TODO -# -# cross language support -# locale expansion -# logging check report .... -# -# - -alfresco.commitInterval=1000 -alfresco.newSearcherInterval=2000 - -alfresco.doPermissionChecks=true - - -# -# Metadata pulling control -# -alfresco.metadata.skipDescendantDocsForSpecificTypes=false -alfresco.metadata.ignore.datatype.0=cm:person -alfresco.metadata.ignore.datatype.1=app:configurations -alfresco.metadata.skipDescendantDocsForSpecificAspects=false -#alfresco.metadata.ignore.aspect.0= - - -# -# Suggestions -# -solr.suggester.enabled=false -# -1 to disable suggester build throttling -solr.suggester.minSecsBetweenBuilds=3600 - -# -# Limit the maximum text size of transformed content sent to the index - in bytes -# -alfresco.contentStreamLimit=10000000 - -#Sharding default values -shard.instance=1 -shard.count=0 -shard.method=DB_ID +# +# solrcore.properties - used in solrconfig.xml +# + +enable.alfresco.tracking=true + +# +#These are replaced by the admin handler +# +#data.dir.root=DATA_DIR +#data.dir.store=workspace/SpacesStore +#alfresco.stores=workspace://SpacesStore + +# +# Properties loaded during alfresco tracking +# + +alfresco.host=localhost +alfresco.port=8080 +alfresco.port.ssl=8443 +alfresco.baseUrl=/alfresco +alfresco.cron=0/2 * * * * ? * + +#alfresco.index.transformContent=false +#alfresco.ignore.datatype.1=d:content +alfresco.lag=1000 +alfresco.hole.retention=3600000 +# alfresco.hole.check.after is not used yet +# It will reduce the hole checking load +alfresco.hole.check.after=300000 +alfresco.batch.count=1000 + +# encryption + +# none, https +alfresco.secureComms=none + +# ssl +alfresco.encryption.ssl.keystore.type=JCEKS +alfresco.encryption.ssl.keystore.provider= +alfresco.encryption.ssl.keystore.location=ssl.repo.client.keystore +alfresco.encryption.ssl.keystore.passwordFileLocation=ssl-keystore-passwords.properties +alfresco.encryption.ssl.truststore.type=JCEKS +alfresco.encryption.ssl.truststore.provider= +alfresco.encryption.ssl.truststore.location=ssl.repo.client.truststore +alfresco.encryption.ssl.truststore.passwordFileLocation=ssl-truststore-passwords.properties + +# Tracking + +alfresco.corePoolSize=1 +alfresco.maximumPoolSize=-1 +alfresco.keepAliveTime=120 +alfresco.threadPriority=5 +alfresco.threadDaemon=true +alfresco.workQueueSize=-1 + +# HTTP Client + +alfresco.maxTotalConnections=200 +alfresco.maxHostConnections=200 +alfresco.socketTimeout=360000 + +# SOLR caching + +solr.filterCache.size=256 +solr.filterCache.initialSize=128 +solr.queryResultCache.size=1024 +solr.queryResultCache.initialSize=1024 +solr.documentCache.size=1024 +solr.documentCache.initialSize=1024 +solr.queryResultMaxDocsCached=2048 + +solr.authorityCache.size=128 +solr.authorityCache.initialSize=64 +solr.pathCache.size=256 +solr.pathCache.initialSize=128 + +solr.ownerCache.size=128 +solr.ownerCache.initialSize=64 + +solr.readerCache.size=128 +solr.readerCache.initialSize=64 + +solr.deniedCache.size=128 +solr.deniedCache.initialSize=64 + +# SOLR + +solr.maxBooleanClauses=10000 + +# Batch fetch + +alfresco.transactionDocsBatchSize=100 +alfresco.nodeBatchSize=10 +alfresco.changeSetAclsBatchSize=100 +alfresco.aclBatchSize=10 +alfresco.contentReadBatchSize=4000 +alfresco.contentUpdateBatchSize=1000 + +# Warming + +solr.filterCache.autowarmCount=32 +solr.authorityCache.autowarmCount=4 +solr.pathCache.autowarmCount=32 +solr.deniedCache.autowarmCount=0 +solr.readerCache.autowarmCount=0 +solr.ownerCache.autowarmCount=0 +solr.queryResultCache.autowarmCount=4 +solr.documentCache.autowarmCount=512 + +solr.queryResultWindowSize=512 + + +# +# TODO +# +# cross language support +# locale expansion +# logging check report .... +# +# + +alfresco.commitInterval=1000 +alfresco.newSearcherInterval=2000 + +alfresco.doPermissionChecks=true + + +# +# Metadata pulling control +# +alfresco.metadata.skipDescendantDocsForSpecificTypes=false +alfresco.metadata.ignore.datatype.0=cm:person +alfresco.metadata.ignore.datatype.1=app:configurations +alfresco.metadata.skipDescendantDocsForSpecificAspects=false +#alfresco.metadata.ignore.aspect.0= + + +# +# Suggestions +# +solr.suggester.enabled=false +# -1 to disable suggester build throttling +solr.suggester.minSecsBetweenBuilds=3600 + +# +# Limit the maximum text size of transformed content sent to the index - in bytes +# +alfresco.contentStreamLimit=10000000 + +#Sharding default values +shard.instance=1 +shard.count=0 +shard.method=DB_ID diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index ea24e181f..7dc580bf6 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -1,16 +1,15 @@ 4.0.0 - org.alfresco alfresco-search-services Alfresco Search Services Alfresco Search Services Solr distribution zip jar - UTF-8 - UTF-8 - ${maven.build.timestamp} - ${bamboo_fullBuildKey} - ${bamboo_repository_revision_number} + UTF-8 + UTF-8 + ${maven.build.timestamp} + ${bamboo_fullBuildKey} + ${bamboo_repository_revision_number} org.alfresco @@ -19,11 +18,11 @@ ../pom.xml - - org.alfresco - alfresco-search - ${project.version} - + + org.alfresco + alfresco-search + ${project.version} + org.alfresco alfresco-search @@ -34,103 +33,103 @@ alfresco-search-services-${project.version} - - org.codehaus.mojo - properties-maven-plugin - - - initialize - - read-project-properties - - - - config.properties - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-solr-war - validate - - unpack - - - - - org.apache.solr - solr - ${solr.version} - zip - ${project.build.directory} - **/*solr.xml - - - - - - unpack-solr-config - validate - - unpack - - - - - org.alfresco - alfresco-search - ${project.version} - ${project.build.directory}/alfresco-search - - - - - - unpack-solr-libs - validate - - unpack - - - - - org.alfresco - alfresco-search - ${project.version} - libs - ${project.build.directory}/solr-libs - - - - - - copy - validate - - copy - - - - - org.alfresco - alfresco-search - ${project.version} - ${project.build.directory}/solr-libs/libs - - - ${project.build.directory}/wars - false - true - - - - + + org.codehaus.mojo + properties-maven-plugin + + + initialize + + read-project-properties + + + + config.properties + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-solr-war + validate + + unpack + + + + + org.apache.solr + solr + ${solr.version} + zip + ${project.build.directory} + **/*solr.xml + + + + + + unpack-solr-config + validate + + unpack + + + + + org.alfresco + alfresco-search + ${project.version} + ${project.build.directory}/alfresco-search + + + + + + unpack-solr-libs + validate + + unpack + + + + + org.alfresco + alfresco-search + ${project.version} + libs + ${project.build.directory}/solr-libs + + + + + + copy + validate + + copy + + + + + org.alfresco + alfresco-search + ${project.version} + ${project.build.directory}/solr-libs/libs + + + ${project.build.directory}/wars + false + true + + + + maven-antrun-plugin diff --git a/search-services/pom.xml b/search-services/pom.xml index 3646f381f..48cee40be 100644 --- a/search-services/pom.xml +++ b/search-services/pom.xml @@ -12,8 +12,7 @@ Alfresco Solr Search parent 6.6.0 - 5.3-SNAPSHOT - 6.4 + 6.4 @@ -31,32 +30,8 @@ https://git.alfresco.com/search_discovery/searchservices.git HEAD - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - alfresco-internal-staging - https://artifacts.alfresco.com/nexus - ${publicrelease.staging.profile} - Staging Search Services ${project.version} (${bamboo_buildResultKey} ${bamboo_planRepository_revision}) - - ${bamboo_buildNumber} - ${bamboo_buildKey} - ${bamboo_planRepository_revision} - - - - - - - alfresco-search - packaging + alfresco-search + packaging