From 5e9b3a2ac3e63e221cb1ac03542a7af6ebdbce9c Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Sun, 7 Sep 2014 20:53:38 +0000 Subject: [PATCH] RM 2.3 now works against 5.0-BF-SNAPSHOT (Community and Enterprise) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@83493 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- README.txt | 4 +-- pom.xml | 5 ---- rm-server/build.properties | 3 +- rm-server/build.xml | 19 ++++++------ rm-server/pom.xml | 60 ++++++++------------------------------ 5 files changed, 24 insertions(+), 67 deletions(-) diff --git a/README.txt b/README.txt index 3f0c7af850..27ada2f806 100644 --- a/README.txt +++ b/README.txt @@ -25,7 +25,7 @@ Using Eclipse Summary of Available Ant Targets - - configureSOLR : Configures SOLR for Alfresco + - configureSolr : Configures Solr for Alfresco - fullBuild : Creates the amp file and applies it to the war file - incrementalBuild : Creates the jar file and copies the jar file with other files like css, js, ftl, etc. files - prepareEnv : Prepares the development environment (must be run just once) @@ -42,7 +42,7 @@ Summary of Available Internal Ant Targets - copyWebDirectory : Copies the source/web folder - deleteExplodedWar : Deletes the exploded war file - deleteWarFile : Deletes the war file - - fetchSOLR : Gets the the SOLR artifact + - fetchSolr : Gets the the Solr artifact - fetchWarFile : Gets the "original" war file - install : Executes the "mvn install" command - package : Executes the "mvn package" command diff --git a/pom.xml b/pom.xml index 73ae6bd8aa..b6a3fa98f0 100644 --- a/pom.xml +++ b/pom.xml @@ -82,14 +82,9 @@ ${project.build.directory}/jacoco.exec - - - - - ${project.artifactId}-${project.version}${buildNumber}${buildKey} org.apache.maven.plugins diff --git a/rm-server/build.properties b/rm-server/build.properties index 97f39da896..822952c94d 100644 --- a/rm-server/build.properties +++ b/rm-server/build.properties @@ -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} diff --git a/rm-server/build.xml b/rm-server/build.xml index 0551112569..14109d68ef 100644 --- a/rm-server/build.xml +++ b/rm-server/build.xml @@ -33,7 +33,7 @@ - + @@ -46,8 +46,8 @@ - + @@ -59,7 +59,7 @@ - + @@ -85,20 +85,19 @@ ]]> ]]> - + - + - \ No newline at end of file diff --git a/rm-server/pom.xml b/rm-server/pom.xml index 09beb21fc7..5dc43e4252 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -27,7 +27,7 @@ - + org.codehaus.mojo build-helper-maven-plugin @@ -130,30 +130,6 @@ - - Alfresco42 - - - - org.alfresco - alfresco-data-model - ${alfresco.base.version} - config - - - org.alfresco - alfresco-repository - ${alfresco.base.version} - config - - - org.alfresco - alfresco-remote-api - ${alfresco.base.version} - config - - - fullBuild @@ -193,11 +169,17 @@ + + enterprise + + alfresco-enterprise + + org.alfresco - alfresco + ${webapp.id} ${alfresco.base.version} war @@ -221,11 +203,11 @@ test - org.mockito - mockito-all - 1.9.5 + org.mockito + mockito-all + 1.9.5 test - + org.springframework spring-test @@ -246,18 +228,6 @@ tests test - - org.apache.chemistry - chemistry-tck-atompub - 0.1-incubating-unreleased - test - - - org.apache.myfaces.core - myfaces-api - 2.1.9 - test - postgresql @@ -284,11 +254,5 @@ 3.0 test - - - xml-apis - xml-apis - 1.4.01 - \ No newline at end of file