inteligr8/alfresco-sdk
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-sdk.git synced 2025-05-26 17:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed solr in runner profile, and introduced maven-replacer-usage in solr web.xml (same as the Alfresco Maven build, using xml comments as tokens to replace

Browse Source 
git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@709 04253f4f-3451-0410-a141-5562f1e59037
This commit is contained in:
mindthegab 2013-10-30 07:03:11 +00:00
parent 48f3c3a2b3
commit a06f1b3642
6 changed files with 118 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
View File

@ -16,7 +16,7 @@
<profile>
<id>run</id>
<properties>
<solr.project.dir>../solr</solr.project.dir>
<solr.project.dir>${project.basedir}/../solr</solr.project.dir>
</properties>
<build>
<plugins>

57
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml
View File

@ -72,12 +72,6 @@
<outputDirectory>${alfresco.solr.war.overlay}/WEB-INF</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
<directory>src/main/webapp/WEB-INF</directory>
<includes>
<include>web.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
@ -88,6 +82,34 @@
</execution>
</executions>
</plugin>
<!-- Replaces web.xml where applicable, commenting out the security-constraints -->
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<executions>
<execution>
<id>disable-securecomms</id>
<phase>process-resources</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<ignoreErrors>true</ignoreErrors>
<file>${alfresco.solr.war.overlay}/WEB-INF/web.xml</file>
<replacements>
<replacement>
<token><![CDATA[<security-constraint>]]></token>
<value><![CDATA[<!-- <security-constraint>]]></value>
</replacement>
<replacement>
<token><![CDATA[</security-role>]]></token>
<value><![CDATA[</security-role> -->]]></value>
</replacement>
</replacements>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@ -135,6 +157,7 @@
</executions>
</plugin>
</plugins>
</build>
<dependencies>
@ -145,4 +168,26 @@
<type>zip</type>
</dependency>
</dependencies>
<profiles>
<!-- Cleans Alfresco data folder, embedded DB and logs -->
<profile>
<id>purge</id>
<build>
<plugins>
<!-- Cleaning Alfresco Solr -->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>${project.basedir}/solr_home</directory>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

27
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrconfig.xml
View File

@ -128,7 +128,7 @@
-->
<!--<mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>-->
<!--
This option specifies which Lucene LockFactory implementation to use.
@ -210,17 +210,17 @@
</mainIndex>
<!-- Enables JMX if and only if an existing MBeanServer is found, use this
<!-- Enables JMX if and only if an existing MBeanServer is found, use this
if you want to configure JMX through JVM parameters. Remove this to disable
exposing Solr configuration and statistics to JMX.
If you want to connect to a particular server, specify the agentId
e.g. <jmx agentId="myAgent" />
If you want to connect to a particular server, specify the agentId
e.g. <jmx agentId="myAgent" />
If you want to start a new MBeanServer, specify the serviceUrl
e.g <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
If you want to start a new MBeanServer, specify the serviceUrl
e.g <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
For more details see http://wiki.apache.org/solr/SolrJmx
For more details see http://wiki.apache.org/solr/SolrJmx
-->
<jmx />
@ -384,6 +384,11 @@
initialSize="100"
autowarmCount="0"
/>
<cache name="alfrescoArrayListCache"
class="org.alfresco.solr.ArrayListCache"
/>
<cache name="alfrescoAuthorityCache"
class="solr.FastLRUCache"
@ -401,6 +406,14 @@
regenerator="org.alfresco.solr.FilterCacheRegenerator"
/>
<!-- No regnerator or warming is required - this will be populated by the authority cache regenration -->
<cache name="alfrescoReaderToAclIdsCache"
class="solr.FastLRUCache"
size="${solr.readerToAclIdsCache.size:512}"
initialSize="${solr.readerToAclIdsCache.initialSize:512}"
autowarmCount="0"
/>
<listener event="newSearcher" class="org.alfresco.solr.AlfrescoSolrEventListener">
</listener>

21
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrcore.properties
View File

@ -53,21 +53,22 @@ alfresco.workQueueSize=-1
alfresco.maxTotalConnections=40
alfresco.maxHostConnections=40
alfresco.socketTimeout=60000
# SOLR caching
solr.filterCache.size=512
solr.filterCache.initialSize=512
solr.queryResultCache.size=512
solr.queryResultCache.initialSize=512
solr.documentCache.size=512
solr.documentCache.initialSize=512
solr.filterCache.size=64
solr.filterCache.initialSize=64
solr.queryResultCache.size=64
solr.queryResultCache.initialSize=64
solr.documentCache.size=64
solr.documentCache.initialSize=64
solr.queryResultMaxDocsCached=200
solr.authorityCache.size=512
solr.authorityCache.initialSize=512
solr.pathCache.size=512
solr.pathCache.initialSize=512
solr.authorityCache.size=64
solr.authorityCache.initialSize=64
solr.pathCache.size=64
solr.pathCache.initialSize=64
# SOLR

27
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrconfig.xml
View File

@ -128,7 +128,7 @@
-->
<!--<mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>-->
<!--
This option specifies which Lucene LockFactory implementation to use.
@ -210,17 +210,17 @@
</mainIndex>
<!-- Enables JMX if and only if an existing MBeanServer is found, use this
<!-- Enables JMX if and only if an existing MBeanServer is found, use this
if you want to configure JMX through JVM parameters. Remove this to disable
exposing Solr configuration and statistics to JMX.
If you want to connect to a particular server, specify the agentId
e.g. <jmx agentId="myAgent" />
If you want to connect to a particular server, specify the agentId
e.g. <jmx agentId="myAgent" />
If you want to start a new MBeanServer, specify the serviceUrl
e.g <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
If you want to start a new MBeanServer, specify the serviceUrl
e.g <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
For more details see http://wiki.apache.org/solr/SolrJmx
For more details see http://wiki.apache.org/solr/SolrJmx
-->
<jmx />
@ -385,6 +385,11 @@
autowarmCount="0"
/>
<cache name="alfrescoArrayListCache"
class="org.alfresco.solr.ArrayListCache"
/>
<cache name="alfrescoAuthorityCache"
class="solr.FastLRUCache"
size="${solr.authorityCache.size:512}"
@ -401,6 +406,14 @@
regenerator="org.alfresco.solr.FilterCacheRegenerator"
/>
<!-- No regnerator or warming is required - this will be populated by the authority cache regenration -->
<cache name="alfrescoReaderToAclIdsCache"
class="solr.FastLRUCache"
size="${solr.readerToAclIdsCache.size:512}"
initialSize="${solr.readerToAclIdsCache.initialSize:512}"
autowarmCount="0"
/>
<listener event="newSearcher" class="org.alfresco.solr.AlfrescoSolrEventListener">
</listener>

23
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrcore.properties
View File

@ -58,21 +58,25 @@ alfresco.workQueueSize=-1
alfresco.maxTotalConnections=40
alfresco.maxHostConnections=40
alfresco.socketTimeout=60000
# SOLR caching
solr.filterCache.size=512
solr.filterCache.initialSize=512
solr.filterCache.size=64
solr.filterCache.initialSize=64
solr.queryResultCache.size=1024
solr.queryResultCache.initialSize=1024
solr.documentCache.size=512
solr.documentCache.initialSize=512
solr.documentCache.size=64
solr.documentCache.initialSize=64
solr.queryResultMaxDocsCached=2000
solr.authorityCache.size=512
solr.authorityCache.initialSize=512
solr.pathCache.size=512
solr.pathCache.initialSize=512
solr.authorityCache.size=64
solr.authorityCache.initialSize=64
solr.pathCache.size=64
solr.pathCache.initialSize=64
solr.readerToAclIdsCache.size=64
solr.readerToAclIdsCache.initialSize=64
# SOLR
@ -101,3 +105,6 @@ solr.queryResultWindowSize=200
# logging check report ....
#
#
alfresco.doPermissionChecks=true