rubys 02/02/26 21:07:59
Modified: proposal/gump rubypad.xml
proposal/gump/java Jenny.java
proposal/gump/project eyebrowse.xml jakarta-ant.xml
jakarta-avalon-phoenix.xml jakarta-commons.xml
scarab.xml
Log:
Fixes made on the airplane and one (antmyrmidon) made afterwards
Revision Changes Path
1.45 +2 -2 jakarta-alexandria/proposal/gump/rubypad.xml
Index: rubypad.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/rubypad.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- rubypad.xml 10 Jan 2002 04:09:59 -0000 1.44
+++ rubypad.xml 27 Feb 2002 05:07:59 -0000 1.45
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
-<workspace basedir="D:\jakarta" pkgdir="C:\opt" version="0.3">
+<workspace basedir="C:\jakarta" pkgdir="C:\opt" jardir="C:\jar" version="0.3">
<property name="build.sysclasspath" value="only"/>
@@ -18,7 +18,7 @@
<!-- After the bootstrap -->
<module href="project/gump.xml"/>
- <project name="gump" home="D:\gump">
+ <project name="gump" home="C:\gump">
<ant>
<property name="workspace" value="rubypad.xml"/>
<property name="webstyle" value="stylesheet/jakarta.xsl"/>
1.12 +18 -13 jakarta-alexandria/proposal/gump/java/Jenny.java
Index: Jenny.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/java/Jenny.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Jenny.java 25 Feb 2002 20:45:35 -0000 1.11
+++ Jenny.java 27 Feb 2002 05:07:59 -0000 1.12
@@ -40,6 +40,9 @@
System.err.print("Error parsing file " + source);
System.err.println(" line " + e.getLineNumber() + ": ");
throw e;
+ } catch (java.net.UnknownHostException uhe) {
+ System.out.println(uhe.toString());
+ return null;
}
}
@@ -103,23 +106,25 @@
String source=href.getValue();
Node sub = parse(source);
- if (source.lastIndexOf(".")>0) {
- source=source.substring(0,source.lastIndexOf("."));
- }
+ if (sub != null) {
+ if (source.lastIndexOf(".")>0) {
+ source=source.substring(0,source.lastIndexOf("."));
+ }
- if (source.lastIndexOf("/")>0) {
- source=source.substring(source.lastIndexOf("/")+1);
- }
+ if (source.lastIndexOf("/")>0) {
+ source=source.substring(source.lastIndexOf("/")+1);
+ }
- node.removeAttribute("href");
- node.setAttribute("defined-in", source);
+ node.removeAttribute("href");
+ node.setAttribute("defined-in", source);
- Document doc = node.getOwnerDocument();
- Element copy=(Element)doc.importNode(sub.getFirstChild(), true);
- moveChildren(node, copy);
+ Document doc = node.getOwnerDocument();
+ Element copy=(Element)doc.importNode(sub.getFirstChild(), true);
+ moveChildren(node, copy);
- node.getParentNode().replaceChild(copy,node);
- node = copy;
+ node.getParentNode().replaceChild(copy,node);
+ node = copy;
+ }
}
// move all profile information to the front
1.6 +7 -6 jakarta-alexandria/proposal/gump/project/eyebrowse.xml
Index: eyebrowse.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/eyebrowse.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eyebrowse.xml 7 Feb 2002 20:54:43 -0000 1.5
+++ eyebrowse.xml 27 Feb 2002 05:07:59 -0000 1.6
@@ -10,17 +10,18 @@
<project name="eyebrowse">
<ant target="dist">
<property name="version" value="@@DATE@@"/>
+ <depend property="mm.jar" project="mm.mysql"/>
+ <depend property="jaf.jar" project="jaf"/>
+ <depend property="jakarta-oro.jar" project="jakarta-oro"/>
+ <depend property="javamail.jar" project="javamail"/>
+ <depend property="log4j.jar" project="jakarta-log4j"/>
+ <depend property="lucene.jar" project="jakarta-lucene"/>
+ <depend property="velocity.jar" project="jakarta-velocity"/>
</ant>
<depend project="jakarta-ant"/>
<depend project="xml-xerces"/>
- <depend project="javamail"/>
- <depend project="jaf"/>
- <depend project="jakarta-log4j"/>
- <depend project="jakarta-oro"/>
- <depend project="jakarta-lucene"/>
<depend project="jakarta-servletapi"/>
- <depend project="jakarta-velocity"/>
<depend project="commons-collections"/>
<javadoc nested="build/javadocs"/>
1.35 +1 -1 jakarta-alexandria/proposal/gump/project/jakarta-ant.xml
Index: jakarta-ant.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-ant.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- jakarta-ant.xml 26 Feb 2002 20:44:17 -0000 1.34
+++ jakarta-ant.xml 27 Feb 2002 05:07:59 -0000 1.35
@@ -81,7 +81,7 @@
<project name="jakarta-ant-myrmidon-test">
<ant basedir="proposal/myrmidon" target="test"/>
- <depend project="jakarta-antmyrmidon" inherit="all"/>
+ <depend project="jakarta-ant-myrmidon" inherit="all"/>
<work nested="proposal/myrmidon/build/tasks"/>
<work nested="proposal/myrmidon/build/test/classes"/>
</project>
1.23 +1 -0
jakarta-alexandria/proposal/gump/project/jakarta-avalon-phoenix.xml
Index: jakarta-avalon-phoenix.xml
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-avalon-phoenix.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jakarta-avalon-phoenix.xml 26 Feb 2002 20:36:08 -0000 1.22
+++ jakarta-avalon-phoenix.xml 27 Feb 2002 05:07:59 -0000 1.23
@@ -25,6 +25,7 @@
<depend project="xdoclet"/>
<depend project="dist-bsf"/>
<depend project="rhino"/>
+ <depend project="xdoclet"/>
<option project="jakarta-servletapi-4"/>
<home nested="build/lib"/>
1.59 +13 -13 jakarta-alexandria/proposal/gump/project/jakarta-commons.xml
Index: jakarta-commons.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-commons.xml,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- jakarta-commons.xml 21 Feb 2002 09:33:12 -0000 1.58
+++ jakarta-commons.xml 27 Feb 2002 05:07:59 -0000 1.59
@@ -67,19 +67,6 @@
<javadoc nested="digester/dist/docs/api"/>
</project>
- <project name="commons-logging">
- <description>Logging Library Package</description>
- <url href="http://jakarta.apache.org/commons/"/>
- <ant basedir="logging" target="dist"/>
- <depend project="jakarta-ant"/>
- <depend project="xml-xerces"/>
- <depend project="jakarta-log4j"/>
- <depend project="jakarta-avalon-logkit"/>
- <home nested="logging/dist"/>
- <jar name="commons-logging.jar"/>
- <javadoc nested="logging/dist/docs/api"/>
- </project>
-
<project name="commons-httpclient">
<description>HTTP Client Library</description>
<url href="http://jakarta.apache.org/commons/httpclient/"/>
@@ -125,6 +112,19 @@
<home nested="latka/dist"/>
<jar name="commons-latka.jar"/>
<javadoc nested="latka/build/docs/api"/>
+ </project>
+
+ <project name="commons-logging">
+ <description>Logging Library Package</description>
+ <url href="http://jakarta.apache.org/commons/"/>
+ <ant basedir="logging" target="dist"/>
+ <depend project="jakarta-ant"/>
+ <depend project="xml-xerces"/>
+ <depend project="jakarta-log4j"/>
+ <depend project="jakarta-avalon-logkit"/>
+ <home nested="logging/dist"/>
+ <jar name="commons-logging.jar"/>
+ <javadoc nested="logging/dist/docs/api"/>
</project>
<project name="commons-pool">
1.20 +6 -0 jakarta-alexandria/proposal/gump/project/scarab.xml
Index: scarab.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/scarab.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- scarab.xml 21 Jan 2002 18:36:03 -0000 1.19
+++ scarab.xml 27 Feb 2002 05:07:59 -0000 1.20
@@ -35,4 +35,10 @@
<jar nested="lib/scarab-@@DATE@@/jar"/>
</project>
+ <project name="mm.mysql">
+ <url href="http://mmmysql.sourceforge.net/"/>
+ <description>JDBC driver for MySQL</description>
+ <jar name="lib/mm.mysql-2.0.11-bin.jar"/>
+ </project>
+
</module>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
