Commit a06f1b36 authored by mindthegab's avatar mindthegab
Browse files

fixed solr in runner profile, and introduced maven-replacer-usage in solr... 

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

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@709 04253f4f-3451-0410-a141-5562f1e59037
parent 48f3c3a2

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

+1 −1
Original line number Diff line number Diff line
@@ -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>

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

+51 −6
Original line number Diff line number Diff line
@@ -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>

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

+20 −7
Original line number Diff line number Diff line
@@ -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>

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

+11 −10
Original line number Diff line number Diff line
@@ -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

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

+20 −7
Original line number Diff line number Diff line
@@ -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>