You are viewing a plain text version of this content. The canonical link for it is here.
Posted to alexandria-dev@jakarta.apache.org by ru...@apache.org on 2002/01/22 18:36:33 UTC
cvs commit: jakarta-alexandria/proposal/gump/project javacc.xml jakarta-lucene.xml
rubys 02/01/22 09:36:33
Modified: proposal/gump/java Project.java
proposal/gump/profile gump.xml
proposal/gump/project jakarta-lucene.xml
Added: proposal/gump/project javacc.xml
Log:
In accordance with http://www.webgain.com/products/java_cc/usage.html,
JavaCC is owned by Sun, free (as in beer), but not freely distributable.
Revision Changes Path
1.30 +8 -7 jakarta-alexandria/proposal/gump/java/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/java/Project.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Project.java 17 Jan 2002 13:39:55 -0000 1.29
+++ Project.java 22 Jan 2002 17:36:32 -0000 1.30
@@ -191,11 +191,17 @@
*/
private void computeHome(Element home) {
String basedir = Workspace.getBaseDir();
- String pkgdir = Workspace.getPkgDir();
Module module = Module.find(element.getAttribute("module"));
if (module == null) return;
- String srcdir = module.getSrcDir();
+
+ String srcdir;
+ String pkg = element.getAttribute("package");
+ if (pkg.equals("")) {
+ srcdir = module.getSrcDir();
+ } else {
+ srcdir = Workspace.getPkgDir() + "/" + pkg;
+ }
element.setAttribute("srcdir", srcdir);
// if a description is not provided, copy the one from the module
@@ -226,11 +232,6 @@
} else if (! (attr=home.getAttribute("dir")).equals("")) {
result = attr;
}
- }
-
- if (result.equals("")) {
- String pkg = element.getAttribute("package");
- if (!pkg.equals("")) result = pkgdir + "/" + pkg;
}
if (result.equals("")) result=srcdir;
1.54 +2 -0 jakarta-alexandria/proposal/gump/profile/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/profile/gump.xml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gump.xml 20 Jan 2002 18:00:43 -0000 1.53
+++ gump.xml 22 Jan 2002 17:36:32 -0000 1.54
@@ -81,6 +81,7 @@
<module href="project/dom4j.xml"/>
<module href="project/hsqldb.xml"/>
<module href="project/httpunit.xml"/>
+ <module href="project/javacc.xml"/>
<module href="project/jaxen.xml"/>
<module href="project/jdom.xml"/>
<module href="project/jce.xml"/>
@@ -119,6 +120,7 @@
<project name="j2ee-connector" package="j2ee_connector-1_0-pfd2"/>
<project name="jaas" package="jaas1_0"/>
<project name="jaf" package="jaf-1.0.1"/>
+ <project name="javacc" package="javacc2.1"/>
<project name="javamail" package="javamail-1.2"/>
<project name="jaxp" package="jaxp-1.1"/>
<project name="jce" package="jce"/>
1.6 +0 -11 jakarta-alexandria/proposal/gump/project/jakarta-lucene.xml
Index: jakarta-lucene.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-lucene.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jakarta-lucene.xml 11 Jan 2002 00:59:46 -0000 1.5
+++ jakarta-lucene.xml 22 Jan 2002 17:36:33 -0000 1.6
@@ -23,15 +23,4 @@
<javadoc nested="bin/docs/api"/>
</project>
- <!-- not available via CVS -->
- <project name="javacc">
- <url href="http://www.webgain.com/products/java_cc/"/>
- <description>
- Java Compiler Compiler - The Java Parser Generator
- <font color="red">Potential license issues?</font>
- </description>
-
- <jar name="lib/JavaCC.zip"/>
- </project>
-
</module>
1.1 jakarta-alexandria/proposal/gump/project/javacc.xml
Index: javacc.xml
===================================================================
<module name="javacc">
<url href="http://www.webgain.com/products/java_cc/"/>
<description>
Java Compiler Compiler - The Java Parser Generator
</description>
<project name="javacc">
<home nested="bin"/>
<jar name="lib/javaCC.zip"/>
</project>
</module>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>