From ccf5660286538e582485f592826ea98c46ed3806 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Sun, 7 Dec 2014 21:19:03 +0000
Subject: [PATCH] Small changes in the ant targets

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@91988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 README.txt                 |  4 ++--
 rm-server/build.properties | 14 +-------------
 rm-server/build.xml        | 27 +++++++++++++--------------
 3 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/README.txt b/README.txt
index 27ada2f806..15d8f9c13e 100644
--- a/README.txt
+++ b/README.txt
@@ -25,10 +25,8 @@ Using Eclipse
 
 Summary of Available Ant Targets
 
- - 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)
 
 
 Summary of Available Internal Ant Targets
@@ -36,6 +34,7 @@ Summary of Available Internal Ant Targets
  - alfresco:amp                 : Creates the amp file using alfresco maven plugin
  - alfresco:install             : Installs the amp file to the war file
  - assembleIconPackage          : Assembles an icons package for the module
+ - configureSolr                : Configures Solr4 for Alfresco
  - copyDBDriver                 : Copies the DB driver
  - copyDevContextFile           : Copies the dev-context.xml file
  - copyWarFileToTomcat          : Copies the war file (amp applied) to the webapp folder
@@ -46,4 +45,5 @@ Summary of Available Internal Ant Targets
  - fetchWarFile                 : Gets the "original" war file
  - install                      : Executes the "mvn install" command
  - package                      : Executes the "mvn package" command
+ - prepareEnv                   : Prepares the development environment (must be run just once)
  - unitTest                     : Runs the unit tests
\ No newline at end of file
diff --git a/rm-server/build.properties b/rm-server/build.properties
index 822952c94d..fa6182cc67 100644
--- a/rm-server/build.properties
+++ b/rm-server/build.properties
@@ -5,16 +5,4 @@
 app.war.artifactId=alfresco
 
 # Tomcat folder name used by the alfresco application
-app.tomcat=tomcat
-
-# 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}
-db.driver.version=9.1-901.jdbc4
-db.driver.packaging=jar
\ No newline at end of file
+app.tomcat=tomcat
\ No newline at end of file
diff --git a/rm-server/build.xml b/rm-server/build.xml
index 5dfd57293c..38b8d1509c 100644
--- a/rm-server/build.xml
+++ b/rm-server/build.xml
@@ -10,10 +10,10 @@
    <target name="copyDBDriver">
       <exec executable="${mvn.exec}" failonerror="true">
          <arg value="dependency:get" />
-         <arg value="-DgroupId=${db.driver.groupId}" />
-         <arg value="-DartifactId=${db.driver.artifactId}" />
-         <arg value="-Dversion=${db.driver.version}" />
-         <arg value="-Dpackaging=${db.driver.packaging}" />
+         <arg value="-DgroupId=postgresql" />
+         <arg value="-DartifactId=postgresql" />
+         <arg value="-Dversion=9.1-901.jdbc4" />
+         <arg value="-Dpackaging=jar" />
          <arg value="-Ddest=${app.tomcat.folder}/lib" />
       </exec>
    </target>
@@ -24,16 +24,7 @@
       <copy file="${devContextFile}" todir="config/alfresco/extension" failonerror="true" />
    </target>
 
-   <target name="prepareEnv" depends="copyDBDriver, copyDevContextFile" description="" />
-
-   <target name="unitTest">
-      <exec executable="${mvn.exec}" failonerror="true">
-         <arg value="test" />
-         <arg value="-Dtest=AllUnitTestSuite" />
-      </exec>
-   </target>
-
-   <target name="configureSolr4" description="Configures Tomcat and the Alfresco repository to use Solr4">
+   <target name="configureSolr4">
       <xmlproperty file="../pom.xml" keepRoot="false"/>
       <exec executable="${mvn.exec}" failonerror="true">
          <arg value="dependency:get" />
@@ -118,4 +109,12 @@
       </copy>
    </target>
 
+   <target name="prepareEnv" depends="copyDBDriver, copyDevContextFile, configureSolr4" />
+
+   <target name="unitTest">
+      <exec executable="${mvn.exec}" failonerror="true">
+         <arg value="test" />
+         <arg value="-Dtest=AllUnitTestSuite" />
+      </exec>
+   </target>
 </project>
\ No newline at end of file