inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-09-17 14:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed ssl related configuration as not relevant with changes in solr6

Browse Source
This commit is contained in:
Michael Suzuki
2016-06-03 15:03:31 +01:00
parent b721bc1f6e
commit 3d4b4a839c
4 changed files with 0 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
search-services/alfresco-solr/pom.xml
View File

@@ -269,86 +269,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- <plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-instance-resources</id>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<outputDirectory>${solr.nossl.instance.target.folder}</outputDirectory>
<resources>
<resource>
<directory>${solr.instance.source.folder}</directory>
<excludes>
<exclude>**/ssl.repo*</exclude>
</excludes>
<filtering>true</filtering>
</resource>
<resource>
<directory>${solr.instance.source.folder}</directory>
<includes>
<include>**/ssl.repo*</include>
</includes>
<filtering>false</filtering>
</resource>
</resources>
<useDefaultDelimiters>false</useDefaultDelimiters>
<delimiters>
<delimiter>@@</delimiter>
</delimiters>
</configuration>
</execution>
<execution>
<id>copy-instance-ssl</id>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<outputDirectory>${solr.ssl.instance.target.folder}</outputDirectory>
<resources>
<resource>
<directory>${solr.nossl.instance.target.folder}</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<id>package-config-zip</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<attach>true</attach>
<descriptors>
<descriptor>
source/assembly/solr-instance-zip-nossl.xml
</descriptor>
<descriptor>
source/assembly/solr-instance-zip-ssl.xml
</descriptor>
<descriptor>
source/assembly/solr-instance-zip-sharding.xml
</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
-->
</plugins> </plugins>
</build> </build>

18
search-services/alfresco-solr/src/main/resources/assembly/solr-instance-zip-nossl.xml
View File

@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
<!-- To build this, run "mvn package assembly:assembly" -->
<id>config</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${solr.nossl.instance.target.folder}</directory>
<outputDirectory/>
</fileSet>
</fileSets>
</assembly>

34
search-services/alfresco-solr/src/main/resources/assembly/solr-instance-zip-sharding.xml
View File

@@ -1,34 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
<!-- To build this, run "mvn package assembly:assembly" -->
<id>config-sharding</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<!-- Filter out *-SpacesStore folers -->
<fileSets>
<fileSet>
<directory>${solr.nossl.instance.target.folder}</directory>
<outputDirectory/>
<excludes>
<exclude>archive-SpacesStore/</exclude>
<exclude>workspace-SpacesStore/</exclude>
<exclude>conf/shared.properties.sample</exclude>
</excludes>
</fileSet>
</fileSets>
<!-- Rename conf/shared.properties.sample to conf/shared.properties -->
<files>
<file>
<source>${solr.nossl.instance.target.folder}/conf/shared.properties.sample</source>
<outputDirectory>conf</outputDirectory>
<destName>shared.properties</destName>
</file>
</files>
</assembly>

18
search-services/alfresco-solr/src/main/resources/assembly/solr-instance-zip-ssl.xml
View File

@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
<!-- To build this, run "mvn package assembly:assembly" -->
<id>config-ssl</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${solr.ssl.instance.target.folder}</directory>
<outputDirectory/>
</fileSet>
</fileSets>
</assembly>