inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RA-482 Bring back Solr4 into Distribution

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@108737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2015-07-22 11:19:23 +00:00
parent 4d41c38bff
commit d18caa2315
3 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
distribution/pom.xml
View File

@@ -30,6 +30,20 @@
</exclusions> </exclusions>
</dependency> </dependency>
<!-- Solr4 Distribution -->
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId>
<version>${alfresco.share.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Share Distribution --> <!-- Share Distribution -->
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
@@ -65,6 +79,13 @@
<version>${alfresco.platform.version}</version> <version>${alfresco.platform.version}</version>
<type>zip</type> <type>zip</type>
</artifactItem> </artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId>
<version>${alfresco.platform.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/dependency/solr4</outputDirectory>
</artifactItem>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-share-distribution</artifactId> <artifactId>alfresco-share-distribution</artifactId>

28
distribution/src/assembly/full-distribution.xml
View File

@@ -18,23 +18,41 @@
<outputDirectory/> <outputDirectory/>
</fileSet> </fileSet>
<!-- Share services WAR --> <!-- Solr4 Distribution -->
<fileSet> <fileSet>
<directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.platform.version}</directory> <directory>${project.build.directory}/dependency/solr4</directory>
<outputDirectory>solr4</outputDirectory>
<excludes>
<exclude>solr4.war</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/dependency/solr4</directory>
<outputDirectory>web-server/webapps</outputDirectory>
<includes>
<include>solr4.war</include>
</includes>
</fileSet>
<!-- Share -->
<fileSet>
<directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}</directory>
<includes> <includes>
<include>share.war</include> <include>share.war</include>
</includes> </includes>
<outputDirectory>web-server/webapps</outputDirectory> <outputDirectory>web-server/webapps</outputDirectory>
</fileSet> </fileSet>
<!-- Share services AMP -->
<fileSet> <fileSet>
<directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.platform.version}</directory> <directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}</directory>
<includes> <includes>
<include>*.amp</include> <include>*.amp</include>
</includes> </includes>
<outputDirectory>amps_share</outputDirectory> <outputDirectory>amps_share</outputDirectory>
</fileSet> </fileSet>
<fileSet>
<directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
<outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>
</fileSet>
</fileSets> </fileSets>
</assembly> </assembly>

17
installer/pom.xml
View File

@@ -221,23 +221,6 @@
<type>zip</type> <type>zip</type>
<outputDirectory>${project.build.directory}/distribution/${alfresco.package.name}-${project.version}/web-server/webapps</outputDirectory> <outputDirectory>${project.build.directory}/distribution/${alfresco.package.name}-${project.version}/web-server/webapps</outputDirectory>
</artifactItem> </artifactItem>
<!-- Solr4 Distribution -->
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId>
<version>${alfresco.platform.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/distribution/${alfresco.package.name}-${project.version}/solr4</outputDirectory>
<excludes>solr4.war</excludes>
</artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId>
<version>${alfresco.platform.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/distribution/${alfresco.package.name}-${project.version}/web-server/webapps</outputDirectory>
<includes>solr4.war</includes>
</artifactItem>
<!-- WCMQS Distribution --> <!-- WCMQS Distribution -->
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>