inteligr8/acs-community-packaging
1
0
Fork 0
mirror of https://github.com/Alfresco/acs-community-packaging.git synced 2026-09-16 18:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged searchbcr (5.2.1) to 5.2.N (5.2.1)

Browse Source 
135868 gjames: Adding a solr4 profile to toggle Alfresco Search Services on/off
   By default, solr4 is used.  If you have ASS running independently then
   you can run it -DwithAss or turnoff solr4 profile using !solr4.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@136190 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-04-03 09:35:34 +00:00
parent 1150e43c62
commit e0da9d83b2
1 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+42 -17
View File
@@ -283,17 +283,12 @@
</dependencies>
<configuration>
<systemProperties>
<index.subsystem.name>solr6</index.subsystem.name>
<solr.port>8983</solr.port>
<dir.root>${dir.root}</dir.root>
<index.subsystem.name>solr4</index.subsystem.name>
<solr.host>localhost</solr.host>
<solr.secureComms>none</solr.secureComms>
<solr.port>8080</solr.port>
<solr.port.ssl></solr.port.ssl>
<solr.backup.alfresco.numberToKeep>0</solr.backup.alfresco.numberToKeep>
<solr.backup.archive.numberToKeep>0</solr.backup.archive.numberToKeep>
<solr.solr.home>${runtime.solr.folder}</solr.solr.home>
<solr.solr.model.dir>${runtime.solr.folder}/alfrescoModels</solr.solr.model.dir>
<solr.solr.content.dir>${runtime.solr.folder}/content</solr.solr.content.dir>
</systemProperties>
<delegate>false</delegate>
<useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
@@ -312,16 +307,6 @@
<!-- tomcat7-maven-plugin does not pick up the context.xml file from META-INF -->
<contextFile>${project.build.directory}/tomcat/webapps/alfresco-server-root/META-INF/context.xml</contextFile>
</webapp>
<!-- Run solr4 alongside the repo -->
<webapp>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4</artifactId>
<version>${project.version}</version>
<contextPath>/solr4</contextPath>
<type>war</type>
<asWebapp>true</asWebapp>
<contextFile>${runtime.tomcat.conf.folder}/solr-context.xml</contextFile>
</webapp>
<webapp>
<groupId>org.alfresco</groupId>
<artifactId>api-explorer</artifactId>
@@ -396,5 +381,45 @@
</plugins>
</build>
</profile>
<profile>
<id>solr4</id>
<activation>
<property>
<name>withAss</name>
<value>!true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<configuration>
<systemProperties>
<index.subsystem.name>solr4</index.subsystem.name>
<solr.port>8080</solr.port>
<solr.backup.alfresco.numberToKeep>0</solr.backup.alfresco.numberToKeep>
<solr.backup.archive.numberToKeep>0</solr.backup.archive.numberToKeep>
<solr.solr.home>${runtime.solr.folder}</solr.solr.home>
<solr.solr.model.dir>${runtime.solr.folder}/alfrescoModels</solr.solr.model.dir>
<solr.solr.content.dir>${runtime.solr.folder}/content</solr.solr.content.dir>
</systemProperties>
<webapps combine.children="append">
<!-- Run solr4 alongside the repo -->
<webapp>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4</artifactId>
<version>${project.version}</version>
<contextPath>/solr4</contextPath>
<type>war</type>
<asWebapp>true</asWebapp>
<contextFile>${runtime.tomcat.conf.folder}/solr-context.xml</contextFile>
</webapp>
</webapps>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>