jvanzyl 02/04/18 06:25:01
Modified: src/descriptors SliceProject.class SliceProject.java
build.xml convert-project.dvsl fix-project.dvsl
toolbox.properties
Removed: src/descriptors DepTool.class DepTool.java
Log:
Cleaning up the gump -> maven transformation. We now have something in
a workable format.
Revision Changes Path
1.4 +4 -4 jakarta-turbine-maven/src/descriptors/SliceProject.class
<<Binary file>>
1.4 +3 -3 jakarta-turbine-maven/src/descriptors/SliceProject.java
Index: SliceProject.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/descriptors/SliceProject.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SliceProject.java 9 Apr 2002 13:52:36 -0000 1.3
+++ SliceProject.java 18 Apr 2002 13:25:01 -0000 1.4
@@ -60,7 +60,7 @@
/**
* Get rid of duplicated dependencies in the gump descriptors.
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: SliceProject.java,v 1.3 2002/04/09 13:52:36 dion Exp $
+ * @version $Id: SliceProject.java,v 1.4 2002/04/18 13:25:01 jvanzyl Exp $
*/
public class SliceProject
{
@@ -77,7 +77,7 @@
{
try
{
- File test = new File("p");
+ File test = new File("project-phase2");
String basedir = null;
if (test.exists())
{
@@ -88,7 +88,7 @@
basedir = "src/descriptors";
}
- File f = new File(new File(basedir,"p"), file);
+ File f = new File(new File(basedir,"project-phase2"), file);
FileWriter fw = new FileWriter(f);
fw.write(contents);
fw.close();
1.8 +61 -59 jakarta-turbine-maven/src/descriptors/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/descriptors/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 1 Apr 2002 02:05:25 -0000 1.7
+++ build.xml 18 Apr 2002 13:25:01 -0000 1.8
@@ -29,20 +29,23 @@
includes="**/*.xml"
/>
+ <delete dir="${basedir}/project-phase1"/>
+ <mkdir dir="${basedir}/project-phase1"/>
+
<dvsl
basedir="${gump}/project"
- destdir="${basedir}/project/"
+ destdir="${basedir}/project-phase1/"
extension=".xml"
style="${basedir}/convert-project.dvsl"
includes="**/*.xml"
toolboxfile="${basedir}/toolbox.properties"
/>
- <delete dir="${basedir}/p"/>
- <mkdir dir="${basedir}/p"/>
+ <delete dir="${basedir}/project-phase2"/>
+ <mkdir dir="${basedir}/project-phase2"/>
<dvsl
- basedir="${basedir}/project"
+ basedir="${basedir}/project-phase1"
destdir="${basedir}/junk/"
extension=".xml"
style="${basedir}/slice-project.dvsl"
@@ -53,99 +56,99 @@
<property file="${basedir}/repository/dbxml.xml"/>
<property file="${basedir}/repository/devworks.xml"/>
<property file="${basedir}/repository/exolab.xml"/>
+ <property file="${basedir}/repository/intalio.xml"/>
<property file="${basedir}/repository/jakarta.xml"/>
<property file="${basedir}/repository/jdom.xml"/>
<property file="${basedir}/repository/mozilla.xml"/>
<property file="${basedir}/repository/sourceforge.xml"/>
<property file="${basedir}/repository/tigris.xml"/>
+ <property file="${basedir}/repository/webmacro.xml"/>
<property file="${basedir}/repository/whichever.xml"/>
<property file="${basedir}/repository/xml.xml"/>
<property file="${basedir}/repository/zenplex.xml"/>
- <echo>
- !!!!!!!!!!!1
-
- ${dbxml}
- ${jakarta}
- </echo>
-
<filter token="dbxml" value="${dbxml}"/>
<filter token="devworks" value="${devworks}"/>
<filter token="exolab" value="${exolab}"/>
+ <filter token="intalio" value="${intalio}"/>
<filter token="jakarta" value="${jakarta}"/>
<filter token="jdom" value="${jdom}"/>
<filter token="mozilla" value="${mozilla}"/>
<filter token="sourceforge" value="${sourceforge}"/>
<filter token="tigris" value="${tigris}"/>
<filter token="whichever" value="${whichever}"/>
+ <filter token="webmacro" value="${webmacro}"/>
<filter token="xml" value="${xml}"/>
<filter token="zenplex" value="${zenplex}"/>
<filter token="dbxml-password" value="${dbxml-password}"/>
<filter token="devworks-password" value="${devworks-password}"/>
<filter token="exolab-password" value="${exolab-password}"/>
+ <filter token="intalio-password" value="${intalio-password}"/>
<filter token="jakarta-password" value="${jakarta-password}"/>
<filter token="jdom-password" value="${jdom-password}"/>
<filter token="mozilla-password" value="${mozilla-password}"/>
<filter token="sourceforge-password" value="${sourceforge-password}"/>
<filter token="tigris-password" value="${tigris-password}"/>
+ <filter token="webmacro-password" value="${webmacro-password}"/>
<filter token="whichever-password" value="${whichever-password}"/>
<filter token="xml-password" value="${xml-password}"/>
<filter token="zenplex-password" value="${zenplex-password}"/>
- <delete dir="${basedir}/p2"/>
- <mkdir dir="${basedir}/p2"/>
+ <delete dir="${basedir}/project-phase3"/>
+ <mkdir dir="${basedir}/project-phase3"/>
- <copy todir="${basedir}/p2" filtering="yes">
- <fileset dir="${basedir}/p"/>
+ <copy todir="${basedir}/project-phase3" filtering="yes">
+ <fileset dir="${basedir}/project-phase2"/>
</copy>
- <delete dir="${basedir}/p3"/>
- <mkdir dir="${basedir}/p3"/>
+ <delete dir="${basedir}/project-phase4"/>
+ <mkdir dir="${basedir}/project-phase4"/>
<dvsl
- basedir="${basedir}/p2"
- destdir="${basedir}/p3/"
+ basedir="${basedir}/project-phase3"
+ destdir="${basedir}/project-phase4/"
extension=".xml"
style="${basedir}/fix-project.dvsl"
includes="**/*.xml"
toolboxfile="${basedir}/toolbox.properties">
</dvsl>
- <delete file="${basedir}/p3/antlr.runtime.xml"/>
- <delete file="${basedir}/p3/bootstrap-ant.xml"/>
- <delete file="${basedir}/p3/castor-test.xml"/>
- <delete file="${basedir}/p3/dist-ant.xml"/>
- <delete file="${basedir}/p3/dist-avalon-logkit.xml"/>
- <delete file="${basedir}/p3/dist-xalan.xml"/>
- <delete file="${basedir}/p3/dist-xerces1.xml"/>
- <delete file="${basedir}/p3/dist-xerces.xml"/>
- <delete file="${basedir}/p3/fop-buildtools.xml"/>
- <delete file="${basedir}/p3/gump.xml"/>
- <delete file="${basedir}/p3/jakarta-ant-mutant.xml"/>
- <delete file="${basedir}/p3/jakarta-ant-myrmidom-test.xml"/>
- <delete file="${basedir}/p3/jakarta-ant-myrmidom.xml"/>
- <delete file="${basedir}/p3/jakarta-avalon-dist.xml"/>
- <delete file="${basedir}/p3/jakarta-avalon-site.xml"/>
- <delete file="${basedir}/p3/jakarta-cactus-ant.xml"/>
- <delete file="${basedir}/p3/jakarta-cactus-22.xml"/>
- <delete file="${basedir}/p3/jakarta-cactus-23.xml"/>
- <delete file="${basedir}/p3/jakarta-regexp-package.xml"/>
- <delete file="${basedir}/p3/jakarta-site2.xml"/>
- <delete file="${basedir}/p3/jakarta-turbine-repo.xml"/>
- <delete file="${basedir}/p3/jakarta-turbine-site.xml"/>
- <delete file="${basedir}/p3/jakarta-turbine-tdk-docs.xml"/>
- <delete file="${basedir}/p3/jakarta-velocity-test.xml"/>
- <delete file="${basedir}/p3/jrefactory-pretty.xml"/>
- <delete file="${basedir}/p3/openjmx-release.xml"/>
- <delete file="${basedir}/p3/test-ant.xml"/>
- <delete file="${basedir}/p3/xalan2jdoc.xml"/>
- <delete file="${basedir}/p3/xdoclet-examples.xml"/>
- <delete file="${basedir}/p3/xml-batik-rasterizer.xml"/>
- <delete file="${basedir}/p3/xml-stylebook.xml"/>
- <delete file="${basedir}/p3/xml-xalan2-smoketest-tools.xml"/>
- <delete file="${basedir}/p3/xml-xalan2-smoketest.xml"/>
- <delete file="${basedir}/p3/mx4j-release.xml"/>
+ <delete file="${basedir}/project-phase4/antlr.runtime.xml"/>
+ <delete file="${basedir}/project-phase4/bootstrap-ant.xml"/>
+ <delete file="${basedir}/project-phase4/castor-test.xml"/>
+ <delete file="${basedir}/project-phase4/dist-ant.xml"/>
+ <delete file="${basedir}/project-phase4/dist-avalon-logkit.xml"/>
+ <delete file="${basedir}/project-phase4/dist-xalan.xml"/>
+ <delete file="${basedir}/project-phase4/dist-xerces1.xml"/>
+ <delete file="${basedir}/project-phase4/dist-xerces.xml"/>
+ <delete file="${basedir}/project-phase4/fop-buildtools.xml"/>
+ <delete file="${basedir}/project-phase4/gump.xml"/>
+ <delete file="${basedir}/project-phase4/jakarta-ant-mutant.xml"/>
+ <delete file="${basedir}/project-phase4/jakarta-ant-myrmidom-test.xml"/>
+ <delete file="${basedir}/project-phase4/jakarta-ant-myrmidom.xml"/>
+ <delete file="${basedir}/project-phase4/jakarta-avalon-dist.xml"/>
+ <delete file="${basedir}/project-phase4/jakarta-avalon-site.xml"/>
+ <delete file="${basedir}/project-phase4/jakarta-cactus-ant.xml"/>
+ <delete file="${basedir}/project-phase4/jakarta-cactus-22.xml"/>
+ <delete file="${basedir}/project-phase4/jakarta-cactus-23.xml"/>
+ <delete file="${basedir}/project-phase4/jakarta-regexp-package.xml"/>
+ <delete file="${basedir}/project-phase4/jakarta-site2.xml"/>
+ <delete file="${basedir}/project-phase4/jakarta-turbine-repo.xml"/>
+ <delete file="${basedir}/project-phase4/jakarta-turbine-site.xml"/>
+ <delete file="${basedir}/project-phase4/jakarta-turbine-tdk-docs.xml"/>
+ <delete file="${basedir}/project-phase4/jakarta-velocity-test.xml"/>
+ <delete file="${basedir}/project-phase4/jrefactory-pretty.xml"/>
+ <delete file="${basedir}/project-phase4/openjmx-release.xml"/>
+ <delete file="${basedir}/project-phase4/test-ant.xml"/>
+ <delete file="${basedir}/project-phase4/xalan2jdoc.xml"/>
+ <delete file="${basedir}/project-phase4/xdoclet-examples.xml"/>
+ <delete file="${basedir}/project-phase4/xml-batik-rasterizer.xml"/>
+ <delete file="${basedir}/project-phase4/xml-stylebook.xml"/>
+ <delete file="${basedir}/project-phase4/xml-xalan2-smoketest-tools.xml"/>
+ <delete file="${basedir}/project-phase4/xml-xalan2-smoketest.xml"/>
+ <delete file="${basedir}/project-phase4/mx4j-release.xml"/>
+ <delete file="${basedir}/project-phase4/alexandria-castor.xml"/>
<delete>
<fileset dir="${basedir}/project">
@@ -154,17 +157,16 @@
</delete>
<copy todir="${basedir}/project">
- <fileset dir="${basedir}/p3">
+ <fileset dir="${basedir}/project-phase4">
<include name="*.xml"/>
</fileset>
</copy>
- <!--
- <delete dir="${basedir}/p"/>
- <delete dir="${basedir}/p2"/>
- <delete dir="${basedir}/p3"/>
+ <delete dir="${basedir}/project-phase1"/>
+ <delete dir="${basedir}/project-phase2"/>
+ <delete dir="${basedir}/project-phase3"/>
+ <delete dir="${basedir}/project-phase4"/>
<delete dir="${basedir}/junk"/>
- -->
</target>
1.6 +2 -2 jakarta-turbine-maven/src/descriptors/convert-project.dvsl
Index: convert-project.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/descriptors/convert-project.dvsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- convert-project.dvsl 24 Mar 2002 21:09:07 -0000 1.5
+++ convert-project.dvsl 18 Apr 2002 13:25:01 -0000 1.6
@@ -25,8 +25,8 @@
<url>#if($url)$url#else$!parentUrl#end</url>
<cvshp>$!cvshp</cvshp>
<cvsdir>$!cvsdir</cvsdir>
- <cvs>#if($cvs)@$cvs@#end</cvs>
+ <cvsRoot>#if($cvs)@$cvs@#end</cvsRoot>
<cvsPassword>#if($cvs)@${cvs}-password@#end</cvsPassword>
- <module>$!module</module>
+ <cvsModule>$!module</cvsModule>
</project>
#end
1.3 +6 -6 jakarta-turbine-maven/src/descriptors/fix-project.dvsl
Index: fix-project.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/descriptors/fix-project.dvsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fix-project.dvsl 24 Mar 2002 21:09:07 -0000 1.2
+++ fix-project.dvsl 18 Apr 2002 13:25:01 -0000 1.3
@@ -2,31 +2,31 @@
<project>
#set ($cvshp = $context.node.cvshp.toString())
#set ($cvsdir = $context.node.cvsdir.toString())
-#set ($cvs = $context.node.cvs)
+#set ($cvsRoot = $context.node.cvsRoot)
<name>$context.node.name</name>
<id>$context.node.name</id>
<description>$context.node.description</description>
<package>$context.node.package</package>
<url>$context.node.url</url>
- $context.applyTemplates("cvs")
+ $context.applyTemplates("cvsRoot")
<cvsPassword>$context.node.cvsPassword</cvsPassword>
- <module>$context.node.module</module>
+ <cvsModule>$context.node.cvsModule</cvsModule>
</project>
#end
#match ("cvshp") #end
#match ("cvsdir") #end
-#match ("cvs")
+#match ("cvsRoot")
#if ($cvshp)
#set ($cvshp = "${cvshp}.")
-#set ($s = $toolbox.slicer.replace("$cvs", "@HOSTPREFIX@", "$cvshp"))
+#set ($s = $toolbox.slicer.replace("$cvsRoot", "@HOSTPREFIX@", "$cvshp"))
#end
#if ($cvsdir)
#set ($cvsdir = $cvsdir)
#set ($s2 = $toolbox.slicer.replace("$s", "@PATH@", "/$cvsdir"))
+<cvsRoot>$!s2</cvsRoot>#end
#end
-<cvs>$!s2</cvs>#end
#match("*")
$node.copy()
1.3 +0 -1 jakarta-turbine-maven/src/descriptors/toolbox.properties
Index: toolbox.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/descriptors/toolbox.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- toolbox.properties 11 Mar 2002 23:39:22 -0000 1.2
+++ toolbox.properties 18 Apr 2002 13:25:01 -0000 1.3
@@ -1,3 +1,2 @@
toolbox.contextname = toolbox
-toolbox.tool.deptool = DepTool
toolbox.tool.slicer = SliceProject
