jvanzyl 02/03/11 15:39:22
Modified: src/descriptors build.xml convert-project.dvsl
convert-repository.dvsl toolbox.properties
Added: src/descriptors SliceProject.class SliceProject.java
fix-project.dvsl slice-project.dvsl
Log:
Taking the gump descriptors and 'normalizing' them. Each project descriptors
contains all its own information. The 'ant convert' target will create
maven descriptors for all the gump descriptors and split out the nested
projects and merge the cvs information in the repository descriptors
into the project descriptors.
Revision Changes Path
1.3 +129 -4 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 21 Feb 2002 21:06:31 -0000 1.2
+++ build.xml 11 Mar 2002 23:39:21 -0000 1.3
@@ -1,4 +1,4 @@
-<project name="dvsl" default="docs" basedir=".">
+<project name="dvsl" default="convert" basedir=".">
<property file="${user.home}/build.properties"/>
<property file="default.properties"/>
@@ -20,6 +20,7 @@
<property name="gump" value="../../../jakarta-alexandria/proposal/gump"/>
+ <!--
<dvsl
basedir="${gump}/profile"
destdir="profile/"
@@ -28,6 +29,17 @@
includes="**/*.xml"
/>
+ -->
+
+ <dvsl
+ basedir="${gump}/repository"
+ destdir="repository/"
+ extension=".xml"
+ style="${basedir}/convert-repository.dvsl"
+ toolboxfile="${basedir}/toolbox.properties"
+ includes="**/*.xml"
+ />
+
<dvsl
basedir="${gump}/project"
destdir="project/"
@@ -36,16 +48,129 @@
includes="**/*.xml"
toolboxfile="${basedir}/toolbox.properties"
/>
+
+ <delete dir="p"/>
+ <mkdir dir="p"/>
+
+ <dvsl
+ basedir="project"
+ destdir="junk/"
+ extension=".xml"
+ style="${basedir}/slice-project.dvsl"
+ includes="**/*.xml"
+ toolboxfile="${basedir}/toolbox.properties"
+ />
+
+ <property file="${basedir}/repository/dbxml.xml"/>
+ <property file="${basedir}/repository/devworks.xml"/>
+ <property file="${basedir}/repository/exolab.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/whichever.xml"/>
+ <property file="${basedir}/repository/xml.xml"/>
+ <property file="${basedir}/repository/zenplex.xml"/>
+
+ <filter token="dbxml" value="${dbxml}"/>
+ <filter token="devworks" value="${devworks}"/>
+ <filter token="exolab" value="${exolab}"/>
+ <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="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="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="whichever-password" value="${whichever-password}"/>
+ <filter token="xml-password" value="${xml-password}"/>
+ <filter token="zenplex-password" value="${zenplex-password}"/>
+
+ <delete dir="p2"/>
+ <mkdir dir="p2"/>
+
+ <copy todir="p2" filtering="yes">
+ <fileset dir="p"/>
+ </copy>
+
+ <delete dir="p3"/>
+ <mkdir dir="p3"/>
<dvsl
- basedir="${gump}/repository"
- destdir="repository/"
+ basedir="p2"
+ destdir="p3/"
extension=".xml"
- style="${basedir}/convert-repository.dvsl"
+ style="${basedir}/fix-project.dvsl"
includes="**/*.xml"
+ toolboxfile="${basedir}/toolbox.properties"
/>
+
+ <delete file="p3/antlr.runtime.xml"/>
+ <delete file="p3/bootstrap-ant.xml"/>
+ <delete file="p3/castor-test.xml"/>
+ <delete file="p3/dist-ant.xml"/>
+ <delete file="p3/dist-avalon-logkit.xml"/>
+ <delete file="p3/dist-xalan.xml"/>
+ <delete file="p3/dist-xerces1.xml"/>
+ <delete file="p3/dist-xerces.xml"/>
+ <delete file="p3/fop-buildtools.xml"/>
+ <delete file="p3/gump.xml"/>
+ <delete file="p3/jakarta-ant-mutant.xml"/>
+ <delete file="p3/jakarta-ant-myrmidom-test.xml"/>
+ <delete file="p3/jakarta-ant-myrmidom.xml"/>
+ <delete file="p3/jakarta-avalon-dist.xml"/>
+ <delete file="p3/jakarta-avalon-site.xml"/>
+ <delete file="p3/jakarta-cactus-ant.xml"/>
+ <delete file="p3/jakarta-cactus-22.xml"/>
+ <delete file="p3/jakarta-cactus-23.xml"/>
+ <delete file="p3/jakarta-regexp-package.xml"/>
+ <delete file="p3/jakarta-site2.xml"/>
+ <delete file="p3/jakarta-turbine-repo.xml"/>
+ <delete file="p3/jakarta-turbine-site.xml"/>
+ <delete file="p3/jakarta-turbine-tdk-docs.xml"/>
+ <delete file="p3/jakarta-velocity-test.xml"/>
+ <delete file="p3/jrefactory-pretty.xml"/>
+ <delete file="p3/openjmx-release.xml"/>
+ <delete file="p3/test-ant.xml"/>
+ <delete file="p3/xalan2jdoc.xml"/>
+ <delete file="p3/xdoclet-examples.xml"/>
+ <delete file="p3/xml-batik-rasterizer.xml"/>
+ <delete file="p3/xml-stylebook.xml"/>
+ <delete file="p3/xml-xalan2-smoketest-tools.xml"/>
+ <delete file="p3/xml-xalan2-smoketest.xml"/>
+
+ <delete>
+ <fileset dir="project">
+ <include name="*.xml"/>
+ </fileset>
+ </delete>
+
+ <copy todir="project">
+ <fileset dir="p3">
+ <include name="*.xml"/>
+ </fileset>
+ </copy>
+
+ <delete dir="p"/>
+ <delete dir="p2"/>
+ <delete dir="p3"/>
+ <delete dir="junk"/>
</target>
+
+
+
</project>
1.4 +13 -4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- convert-project.dvsl 8 Mar 2002 19:36:18 -0000 1.3
+++ convert-project.dvsl 11 Mar 2002 23:39:21 -0000 1.4
@@ -1,8 +1,14 @@
#match("module")
#set ($cvs = $context.node.cvs.attribute("repository"))
+#set ($cvshp = $context.node.cvs.attribute("host-prefix"))
+#set ($cvsdir = $context.node.cvs.attribute("dir"))
#set ($parentDescription = $context.node.description)
#set ($parentUrl = $context.node.url.attribute("href"))
+#set ($nodes = $node.selectNodes("project"))
+#set ($module = $attrib.name)
+<parent>
$context.applyTemplates("project")
+</parent>
#end
#match ("project")
@@ -11,12 +17,15 @@
<project>
<name>$context.node.attribute("name")</name>
<description>
-
#if($description)$description.toString().trim()#else$parentDescription.toString().trim()#end
+
#if($description)$description.toString().trim()#else$!parentDescription.toString().trim()#end
</description>
<package>$!context.node.package</package>
- <url>#if($url)$url#else$parentUrl#end</url>
- <cvs>$!cvs</cvs>
+ <url>#if($url)$url#else$!parentUrl#end</url>
+ <cvshp>$!cvshp</cvshp>
+ <cvsdir>$!cvsdir</cvsdir>
+ <cvs>#if($cvs)@$cvs@#end</cvs>
+ <cvsPassword>#if($cvs)@${cvs}-password@#end</cvsPassword>
+ <module>$!module</module>
</project>
-
#end
1.2 +5 -46 jakarta-turbine-maven/src/descriptors/convert-repository.dvsl
Index: convert-repository.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/descriptors/convert-repository.dvsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- convert-repository.dvsl 19 Feb 2002 18:09:58 -0000 1.1
+++ convert-repository.dvsl 11 Mar 2002 23:39:21 -0000 1.2
@@ -1,50 +1,9 @@
#match("repository")
-<repository>
- <name>$attrib.name</name>
- $context.applyTemplates("title")
- <type>$attrib.type</type>
- $context.applyTemplates("home-page")
- $context.applyTemplates("cvsweb")
- $context.applyTemplates("root")
-</repository>
+#set ($name = $attrib.name)
+$context.applyTemplates("root")
#end
-#match("home-page")
-<homePage>$context.node</homePage>
-#end
-
-#match("title")
-<title>$context.node</title>
-#end
-
-#match("cvsweb")
-<cvsWeb>$context.node</cvsWeb>
-#end
-
-#match("root")
-$context.applyTemplates("method")
- $context.applyTemplates("hostname")
- $context.applyTemplates("user")
- $context.applyTemplates("password")
- $context.applyTemplates("path")
-#end
-
-#match("method")
-<method>$context.node</method>
-#end
-
-#match("hostname")
-<hostname>$context.node</hostname>
-#end
-
-#match("user")
-<user>$context.node</user>
-#end
-
-#match("password")
-<password>$context.node</password>
-#end
-
-#match("path")
-<path>$context.node</path>
+#match ("root")
+$name=:$context.node.method:$context.node.user@@HOSTPREFIX@$context.node.hostname:$context.node.path@PATH@
+${name}-password=$context.node.password
#end
1.2 +2 -0 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- toolbox.properties 19 Feb 2002 18:09:58 -0000 1.1
+++ toolbox.properties 11 Mar 2002 23:39:22 -0000 1.2
@@ -1 +1,3 @@
+toolbox.contextname = toolbox
toolbox.tool.deptool = DepTool
+toolbox.tool.slicer = SliceProject
1.1 jakarta-turbine-maven/src/descriptors/SliceProject.class
<<Binary file>>
1.1 jakarta-turbine-maven/src/descriptors/SliceProject.java
Index: SliceProject.java
===================================================================
import java.util.HashMap;
// Get rid of duplicated dependencies in the gump descriptors.
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileWriter;
public class SliceProject
{
public SliceProject()
{
}
public String hello()
{
return "hello";
}
public void slice(String file, String contents)
{
try
{
File f = new File(new File("p"), file);
FileWriter fw = new FileWriter(f);
fw.write(contents);
fw.close();
}
catch (Exception e)
{
e.printStackTrace();
}
}
public static String replace(String text, String repl, String with)
{
int max = -1;
if (text == null)
{
return null;
}
StringBuffer buf = new StringBuffer(text.length());
int start = 0, end = 0;
while ( (end = text.indexOf(repl, start)) != -1 )
{
//System.err.println("end=" + end);
buf.append(text.substring(start, end)).append(with);
start = end + repl.length();
//System.err.println("new start=" + start);
if (--max == 0)
{
break;
}
}
buf.append(text.substring(start));
return buf.toString();
}
}
1.1 jakarta-turbine-maven/src/descriptors/fix-project.dvsl
Index: fix-project.dvsl
===================================================================
#match("project")
<project>
#set ($cvshp = $context.node.cvshp.toString())
#set ($cvsdir = $context.node.cvsdir.toString())
#set ($cvs = $context.node.cvs)
<name>$context.node.name</name>
<description>$context.node.description</description>
<package>$context.node.package</package>
<url>$context.node.url</url>
$context.applyTemplates("cvs")
<cvsPassword>$context.node.cvsPassword</cvsPassword>
<module>$context.node.module</module>
</project>
#end
#match ("cvshp") #end
#match ("cvsdir") #end
#match ("cvs")
#if ($cvshp)
#set ($cvshp = "${cvshp}.")
#set ($s = $toolbox.slicer.replace("$cvs", "@HOSTPREFIX@", "$cvshp"))
#end
#if ($cvsdir)
#set ($cvsdir = $cvsdir)
#set ($s2 = $toolbox.slicer.replace("$s", "@PATH@", "/$cvsdir"))
#end
<cvs>$s2</cvs>#end
#match("*")
$node.copy()
#end
1.1 jakarta-turbine-maven/src/descriptors/slice-project.dvsl
Index: slice-project.dvsl
===================================================================
#match("project")
#set ($name = $context.node.name)
$toolbox.slicer.slice("${name}.xml", $node.copy())
#end
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
