Author: niclas Date: Sun Dec 12 00:42:18 2004 New Revision: 111645 URL: http://svn.apache.org/viewcvs?view=rev&rev=111645 Log: Corrupt. Modified: incubator/directory/janus/trunk/gump.xml
Modified: incubator/directory/janus/trunk/gump.xml Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/gump.xml?view=diff&rev=111645&p1=incubator/directory/janus/trunk/gump.xml&r1=111644&p2=incubator/directory/janus/trunk/gump.xml&r2=111645 ============================================================================== --- incubator/directory/janus/trunk/gump.xml (original) +++ incubator/directory/janus/trunk/gump.xml Sun Dec 12 00:42:18 2004 @@ -71,98 +71,6 @@ <junitreport nested="jdbc/target/test-reports" /> -<<<<<<< .mine - <project name="janus-api"> - <maven basedir="core/api" goal="jar" > - <property name="maven.final.name" value="janus-api-@@DATE@@"/> - </maven> - <package>org.apache.janus</package> - - <depend project="jmock"/> - <depend project="junit"/> - <depend project="xml-xerces"/> - - <home nested="core/api"/> - <mkdir dir="core/api/target/classes"/> - <work nested="core/api/target/classes"/> - <mkdir dir="core/api/target/test-classes"/> - <work nested="core/api/target/test-classes"/> - <jar name="target/janus-api-@@DATE@@.jar"/> - - <nag to="[EMAIL PROTECTED]" - from="directory-naming development <[EMAIL PROTECTED]>"/> - </project> - - <project name="janus-impl"> - <maven basedir="core/impl" goal="jar" > - <property name="maven.final.name" value="janus-impl-@@DATE@@"/> - </maven> - <package>org.apache.janus</package> - - <depend project="commons-collections"/> - <depend project="janus-api"/> - <depend project="jmock"/> - <depend project="junit"/> - <depend project="xml-xerces"/> - - <home nested="core/impl"/> - <mkdir dir="core/impl/target/classes"/> - <work nested="core/impl/target/classes"/> - <mkdir dir="core/impl/target/test-classes"/> - <work nested="core/impl/target/test-classes"/> - <jar name="target/janus-impl-@@DATE@@.jar"/> - - <nag to="[EMAIL PROTECTED]" - from="directory-naming development <[EMAIL PROTECTED]>"/> - </project> - - <project name="janus-jdbc"> - <maven basedir="jdbc" goal="jar" > - <property name="maven.final.name" value="janus-jdbc-@@DATE@@"/> - </maven> - <package>org.apache.janus</package> - - <depend project="hsqldb"/> - <depend project="janus-api"/> - <depend project="janus-impl"/> - <depend project="jmock"/> - <depend project="junit"/> - <depend project="xml-xerces"/> - - <home nested="jdbc"/> - <mkdir dir="jdbc/target/classes"/> - <work nested="jdbc/target/classes"/> - <mkdir dir="jdbc/target/test-classes"/> - <work nested="jdbc/target/test-classes"/> - <jar name="target/janus-jdbc-@@DATE@@.jar"/> - - <nag to="[EMAIL PROTECTED]" - from="directory-naming development <[EMAIL PROTECTED]>"/> - </project> - - <project name="janus-script"> - <maven basedir="script" goal="jar" > - <property name="maven.final.name" value="janus-script-@@DATE@@"/> - </maven> - <package>org.apache.janus</package> - - <depend project="snickers-codec"/> - <depend project="commons-logging"/> - <depend project="commons-net"/> - <depend project="junit"/> - <depend project="xml-xerces"/> - - <home nested="script"/> - <mkdir dir="script/target/classes"/> - <work nested="script/target/classes"/> - <mkdir dir="script/target/test-classes"/> - <work nested="script/target/test-classes"/> - <jar name="target/janus-script-@@DATE@@.jar"/> - - <nag to="[EMAIL PROTECTED]" - from="directory-naming development <[EMAIL PROTECTED]>"/> - </project> -======= <nag from="janus-jdbc development <[EMAIL PROTECTED]>" to="[EMAIL PROTECTED]"/> </project> @@ -235,5 +143,4 @@ <nag from="janus-script development <[EMAIL PROTECTED]>" to="[EMAIL PROTECTED]"/> </project> ->>>>>>> .r111533 </module>
