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

RM 2.3 now works against 5.0-BF-SNAPSHOT (Community and Enterprise)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@83493 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-09-07 20:53:38 +00:00
parent 43a292aa39
commit 5e9b3a2ac3
5 changed files with 24 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rm-server/build.properties
View File

@@ -7,13 +7,12 @@ app.war.artifactId=alfresco
# Tomcat folder name used by the alfresco application
app.tomcat=tomcat
# SOLR configuration
# Solr configuration
solr.directory=solr
solr.artifactId=alfresco-solr
solr.packaging=zip
solr.package=${solr.artifactId}.${solr.packaging}
# DB driver properties
db.driver.groupId=postgresql
db.driver.artifactId=${db.driver.groupId}

19
rm-server/build.xml
View File

@@ -33,7 +33,7 @@
</exec>
</target>
<target name="fetchSOLR">
<target name="fetchSolr">
<xmlproperty file="../pom.xml" keepRoot="false"/>
<exec executable="${mvn.exec}" failonerror="true">
<arg value="dependency:get" />
@@ -46,8 +46,8 @@
<unzip src="${solr.directory}/${solr.package}" dest="${solr.directory}"/>
</target>
<target name="configureSOLR" depends="fetchSOLR"
description="Configures Tomcat and the Alfresco repository to use SOLR">
<target name="configureSolr" depends="fetchSolr"
description="Configures Tomcat and the Alfresco repository to use Solr">
<dirname property="temp.dir" file="${ant.file}"/>
<pathconvert property="base.dir" targetos="unix">
@@ -59,7 +59,7 @@
<mkdir dir="${data.root}/solr-index"/>
<!-- copy SOLR config files -->
<!-- copy Solr config files -->
<copy file="${solr.directory}/context.xml"
tofile="${app.tomcat.folder}/conf/Catalina/localhost/solr.xml" />
<replace file="${app.tomcat.folder}/conf/Catalina/localhost/solr.xml" summary="yes">
@@ -85,20 +85,19 @@
<replacetoken><![CDATA[<!-- Alfresco SSL Connector placeholder -->]]></replacetoken>
<replacevalue><![CDATA[
<Connector port="8443" protocol="org.apache.coyote.http11.Http11Protocol" SSLEnabled="true"
maxThreads="150" scheme="https" keystoreFile="../../data/keystore/ssl.keystore"
maxThreads="150" scheme="https" keystoreFile="../../data/keystore/ssl.keystore"
keystorePass="kT9X6oe68t" keystoreType="JCEKS"
secure="true" connectionTimeout="240000"
truststoreFile="../../data/keystore/ssl.truststore"
secure="true" connectionTimeout="240000"
truststoreFile="../../data/keystore/ssl.truststore"
truststorePass="kT9X6oe68t" truststoreType="JCEKS"
clientAuth="want" sslProtocol="TLS" allowUnsafeLegacyRenegotiation="true" maxHttpHeaderSize="32768" />]]></replacevalue>
</replace>
</replace>
<!-- update project repository.properties file with SOLR properties -->
<!-- update project repository.properties file with Solr properties -->
<propertyfile file="${data.root}/repository.properties">
<entry key="dir.keystore" value="${data.root}/keystore" />
<entry key="index.subsystem.name" value="solr" />
</propertyfile>
</target>
</project>

60
rm-server/pom.xml
View File

@@ -27,7 +27,7 @@
</testResource>
</testResources>
<plugins>
<!-- Additional source folder to be added: source/compatibility -->
<!-- Additional source folder to be added: source/compatibility -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -130,30 +130,6 @@
</plugins>
</build>
</profile>
<profile>
<id>Alfresco42</id>
<!-- 'config' dependencies -->
<dependencies>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-data-model</artifactId>
<version>${alfresco.base.version}</version>
<classifier>config</classifier>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-repository</artifactId>
<version>${alfresco.base.version}</version>
<classifier>config</classifier>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-remote-api</artifactId>
<version>${alfresco.base.version}</version>
<classifier>config</classifier>
</dependency>
</dependencies>
</profile>
<profile>
<id>fullBuild</id>
<build>
@@ -193,11 +169,17 @@
</plugins>
</build>
</profile>
<profile>
<id>enterprise</id>
<properties>
<webapp.id>alfresco-enterprise</webapp.id>
</properties>
</profile>
</profiles>
<dependencies>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco</artifactId>
<artifactId>${webapp.id}</artifactId>
<version>${alfresco.base.version}</version>
<type>war</type>
</dependency>
@@ -221,11 +203,11 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
@@ -246,18 +228,6 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.chemistry</groupId>
<artifactId>chemistry-tck-atompub</artifactId>
<version>0.1-incubating-unreleased</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>2.1.9</version>
<scope>test</scope>
</dependency>
<!-- Database drivers -->
<dependency>
<groupId>postgresql</groupId>
@@ -284,11 +254,5 @@
<version>3.0</version>
<scope>test</scope>
</dependency>
<!-- FIXME: Test do not run (NoClassDefFoundError: org/w3c/dom/ElementTraversal) -->
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
</dependency>
</dependencies>
</project>