diff --git a/README.txt b/README.txt index f098f3ab03..17e30e68a9 100644 --- a/README.txt +++ b/README.txt @@ -2,7 +2,7 @@ Prerequisites - - Maven 3.0.3 (or higher) + - Maven 3.0.4 (or higher) - Eclipse Maven Plugin (m2e) - See Maven setup instructions https://ts.alfresco.com/share/page/site/eng/wiki-page?title=Maven_Setup @@ -13,12 +13,13 @@ Initial Setup - Check out RM code into the "code" directory (eg "checkout https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD") - Create the tomcat instances using "use-tomcat7" and "use-app-tomcat7" + Using Eclipse - Import projects as Maven projects ("Import > Maven > Existing Maven Projects") - Browse to the code directory of your project and select "rm-server/pom.xml" and "rm-share/pom.xml". DO NOT select the parent "/pom.xml" - Open the Ant view and add the build files for both modules ("build.xml") - - Run the "prepareEnv" targets for both modules which will prepare the development environment. This target must be run just once. + - Run the "prepareEnv" target for rm-server which will prepare the development environment. This target must be run just once. - Now "buildAndDeploy" target can be run which will create the amp file, apply it to the war file and copy the war file to webapps folder. @@ -41,8 +42,7 @@ Summary of Available Internal Ant Targets - copyDBDriver : Copies the DB driver - copyDevContextFile : Copies the dev-context.xml file - copyWarFileToTomcat : Copies the war file (amp applied) to the webapp folder - - deleteExplodedWar : Deletes the exploded war file - - deleteWarFile : Deletes the war file - - fetchWarFile : Gets the "original" war file - - install : Executes the "mvn install" command - - updateClassPath : Updates the classpath / Generates the eclipse configuration files \ No newline at end of file + - deleteExplodedWar : Deletes the exploded war file + - deleteWarFile : Deletes the war file + - fetchWarFile : Gets the "original" war file + - install : Executes the "mvn install" command \ No newline at end of file diff --git a/build.xml b/build.xml index 3142151c6c..3c8acd86f7 100644 --- a/build.xml +++ b/build.xml @@ -80,7 +80,7 @@ - + @@ -95,19 +95,21 @@ - - + + - + - - - + + + + + diff --git a/rm-server/pom.xml b/rm-server/pom.xml index 9bbf62b79c..73db5a3277 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -236,6 +236,7 @@ 5.1.14 test + org.uncommons reportng