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

Merge branch 'master' into RM-2587_CaveatMarkingService

Browse Source
This commit is contained in:
nmcerlean
2016-01-22 10:42:03 +00:00
parent 6adcc6b1cd ecdc76b215
commit 43987e02f2
2 changed files with 158 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-community/build.properties
View File

@@ -13,7 +13,7 @@ ant.config.directory=config
ant.source.web.directory=source/web ant.source.web.directory=source/web
# Tomcat properties # Tomcat properties
app.tomcat.folder=${ant.build.directory}/../../../software/${app.tomcat} app.tomcat.folder=${ant.build.directory}/../../../../software/${app.tomcat}
app.tomcat.webapps=${app.tomcat.folder}/webapps app.tomcat.webapps=${app.tomcat.folder}/webapps
# Application properties # Application properties

3
rm-community/rm-server/build.xml
View File

@@ -64,7 +64,6 @@
<arg value="-DgroupId=${groupId}" /> <arg value="-DgroupId=${groupId}" />
<arg value="-DartifactId=alfresco-solr4" /> <arg value="-DartifactId=alfresco-solr4" />
<arg value="-Dversion=${properties.alfresco.base.version}" /> <arg value="-Dversion=${properties.alfresco.base.version}" />
<arg value="-Dclassifier=ssl" />
<arg value="-Dpackaging=war" /> <arg value="-Dpackaging=war" />
<arg value="-Ddest=${ant.build.directory}/solr4.war" /> <arg value="-Ddest=${ant.build.directory}/solr4.war" />
</exec> </exec>
@@ -76,7 +75,7 @@
<fileset dir="${ant.build.directory}/alfresco-repository/alfresco/keystore" /> <fileset dir="${ant.build.directory}/alfresco-repository/alfresco/keystore" />
</copy> </copy>
<property name="solr.root.tmp" location="${basedir}/../../data/solr4" /> <property name="solr.root.tmp" location="${basedir}/../../../data/solr4" />
<pathconvert property="solr.root" targetos="unix"> <pathconvert property="solr.root" targetos="unix">
<path location="${solr.root.tmp}"/> <path location="${solr.root.tmp}"/>