Menu
▾
▴
[Elateportal-devel] elatePortal maven.xml, 1.7, 1.8 project.properties, 1.11, 1.12 .classpath, 1.10, 1.11
|
From: Steffen D. <sd...@us...> - 2008-03-07 10:34:13
|
Update of /cvsroot/elateportal/elatePortal In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9571 Modified Files: maven.xml project.properties .classpath Log Message: enable correction of junit tasks via remote osgi services Index: maven.xml =================================================================== RCS file: /cvsroot/elateportal/elatePortal/maven.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- maven.xml 25 Jan 2007 02:37:53 -0000 1.7 +++ maven.xml 7 Mar 2008 10:33:37 -0000 1.8 @@ -59,6 +59,18 @@ goals="clean" banner="Cleaning" ignoreFailures="true"/> + <maven:reactor + basedir="${basedir}" + includes="applications/autotool-addon/project.xml" + goals="clean" + banner="Cleaning" + ignoreFailures="true"/> + <maven:reactor + basedir="${basedir}" + includes="applications/junit-addon/project.xml" + goals="clean" + banner="Cleaning" + ignoreFailures="true"/> </goal> @@ -112,8 +124,22 @@ banner="Build and Install the JForum application war in your Maven Repo" postProcessing="false" ignoreFailures="false"/> + <maven:reactor + basedir="${basedir}/applications/autotool-addon" + includes="project.xml" + goals="build" + banner="Build and Install the autotool addon task in your Maven Repo" + postProcessing="false" + ignoreFailures="false"/> + <maven:reactor + basedir="${basedir}/applications/junit-addon" + includes="project.xml" + goals="build" + banner="Build and Install the junit addon task in your Maven Repo" + postProcessing="false" + ignoreFailures="false"/> </goal> - + <goal name="recreate.db" description="Creates the j2 db, and only the j2 db!"> <attainGoal name="install.jetspeed.plugin"/> <attainGoal name="j2:portal.genapp"/> @@ -132,11 +158,11 @@ <attainGoal name="install.jetspeed.plugin"/> <attainGoal name="j2:portal.genapp"/> <attainGoal name="war:install"/> - + <attainGoal name="backupUserFolder"/> <attainGoal name="j2:nodbMinStart"/> <attainGoal name="restoreUserFolder"/> - + <attainGoal name="j2:pam.rssdeploy"/> <attainGoal name="j2:pam.demodeploy"/> @@ -164,7 +190,8 @@ <attainGoal name="deploy.decorators"/> <attainGoal name="deploy.psml"/> <attainGoal name="deploy.jforum"/> - + <attainGoal name="deploy.autotool-addon"/> + <attainGoal name="deploy.junit-addon"/> </goal> @@ -217,7 +244,7 @@ postProcessing="false" ignoreFailures="false"/> </goal> - + <goal name="deploy.taskmodel-core-view"> <maven:reactor basedir="${basedir}/taskmodel-core-view" @@ -226,7 +253,7 @@ banner="Deploy the TaskModel Core View war" postProcessing="false" ignoreFailures="false"/> - </goal> + </goal> <!-- TODO: for now, only building jforum is done here to resolve jforum's classpath dependencies for eclipse --> @@ -240,6 +267,41 @@ ignoreFailures="false"/> </goal> + <goal name="deploy.autotool-addon"> + <maven:reactor + basedir="${basedir}/applications/autotool-addon" + includes="project.xml" + goals="deploy" + banner="Build the autotool addon task jar" + postProcessing="false" + ignoreFailures="false"/> + </goal> + + <goal name="deploy.junit-addon"> + <maven:reactor + basedir="${basedir}/applications/junit-addon-correction-interfaces" + includes="project.xml" + goals="deploy" + banner="Build the junit addon task corrector interfaces bundle" + postProcessing="false" + ignoreFailures="false"/> + <maven:reactor + basedir="${basedir}/applications/junit-addon-correction" + includes="project.xml" + goals="deploy" + banner="Build the junit addon task correction implementation bundle" + postProcessing="false" + ignoreFailures="false"/> + <maven:reactor + basedir="${basedir}/applications/junit-addon" + includes="project.xml" + goals="deploy" + banner="Build the junit addon task jar" + postProcessing="false" + ignoreFailures="false"/> + + </goal> + <goal name="deploy.decorators" description="Deploys elatePortal specific decorators to jetspeed"> <attainGoal name="create.decorator.variables"/> <attainGoal name="deploy.layout.decorator"/> @@ -261,21 +323,21 @@ <goal name="deploy.psml" description="Deploy the pAgEs directory into jetspeed. Unfortunately we will have to keep doing this till jetspeed can pick it up from the portlet war file."> <attainGoal name="backupUserFolder"/> - + <ant:delete quiet="true" dir="${jetspeed.webinf.dir}/pages"/> <ant:mkdir dir="${jetspeed.webinf.dir}/pages"/> <ant:copy todir="${jetspeed.webinf.dir}/pages" overwrite="true"> <fileset dir="jetspeed-deploy/pages" casesensitive="yes"/> </ant:copy> - + <attainGoal name="restoreUserFolder"/> </goal> - - - + + + <goal name="backupUserFolder"> <echo message="Started backup..."/> - <util:available file="${jetspeed.webinf.dir}/pages/_user"> + <util:available file="${jetspeed.webinf.dir}/pages/_user"> <ant:delete quiet="true" dir="${maven.build.dir}/temp_user_home_psmls"/> <ant:mkdir dir="${maven.build.dir}/temp_user_home_psmls"/> <ant:copy todir="${maven.build.dir}/temp_user_home_psmls" failonerror="false"> @@ -284,10 +346,10 @@ </util:available> <echo message="Finished backup!"/> </goal> - + <goal name="restoreUserFolder"> <echo message="Started restore..."/> - <util:available file="${maven.build.dir}/temp_user_home_psmls"> + <util:available file="${maven.build.dir}/temp_user_home_psmls"> <ant:delete quiet="true" dir="${jetspeed.webinf.dir}/pages/_user"/> <ant:mkdir dir="${jetspeed.webinf.dir}/pages/_user"/> <ant:copy todir="${jetspeed.webinf.dir}/pages/_user" failonerror="false"> @@ -297,11 +359,11 @@ <echo message="Finished restore!"/> </goal> - + <!--preGoal name="j2:remove.wars"> <attainGoal name="backupUserFolder"/> </preGoal> - + <postGoal name="j2:portal.deploy"> <attainGoal name="restoreUserFolder"/> </postGoal--> Index: project.properties =================================================================== RCS file: /cvsroot/elateportal/elatePortal/project.properties,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- project.properties 30 Sep 2007 13:50:27 -0000 1.11 +++ project.properties 7 Mar 2008 10:33:37 -0000 1.12 @@ -9,6 +9,7 @@ # version settings of the core components jetspeed.version=2.1.3-dev elatePortal.version=0.2-dev +junitaddon.version=0.1 pluto.version=1.0.1 portlet.api.version=1.0 Index: .classpath =================================================================== RCS file: /cvsroot/elateportal/elatePortal/.classpath,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- .classpath 16 Oct 2007 19:28:03 -0000 1.10 +++ .classpath 7 Mar 2008 10:33:37 -0000 1.11 @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="api/src"/> + <classpathentry kind="src" path="taskmodel-core/src"/> + <classpathentry kind="src" path="applications/junit-addon-correction-interfaces/src"/> + <classpathentry kind="src" path="applications/junit-addon-correction/src"/> <classpathentry kind="src" path="applications/autotool-addon/src"/> <classpathentry kind="src" path="applications/junit-addon/src"/> <classpathentry kind="src" path="taskmodel-core-view/src"/> - <classpathentry kind="src" path="taskmodel-core/src"/> <classpathentry kind="src" path="taskmodel-api/src"/> <classpathentry kind="src" path="elatePA/src"/> <classpathentry kind="src" path="jetspeed-deploy/src"/> @@ -53,5 +55,10 @@ <classpathentry kind="var" path="MAVEN_REPO/javamail/jars/javamail-1.3.3.jar"/> <classpathentry kind="var" path="MAVEN_REPO/portlet-api/jars/portlet-api-1.0.jar"/> <classpathentry kind="var" path="MAVEN_REPO/org.eclipse.equinox/jars/org.osgi.impl.framework.eclipse-3.3-dev.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/xmlrpc/jars/xmlrpc-client-3.0.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/xmlrpc/jars/xmlrpc-common-3.0.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/groovy/jars/groovy-all-1.1-rc-1.jar" sourcepath="/LW_C/downloads/groovy-src-1.1-rc-1.zip"/> + <classpathentry kind="var" path="MAVEN_REPO/ch.etz.iks/jars/remote-1.0.0.RC1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/ch.etz.iks/jars/jslp-osgi-1.0.0.RC2.jar"/> <classpathentry kind="output" path="bin"/> </classpath> |