bodewig 2003/01/27 01:00:53
Modified: project jakarta-tomcat-connectors-coyote_10.xml
java Project.java
Log:
Make <property srcdir=.../> work as documented, i.e. lookup the
project instead of the module named by the project attribute.
Revision Changes Path
1.3 +4 -0 jakarta-gump/project/jakarta-tomcat-connectors-coyote_10.xml
Index: jakarta-tomcat-connectors-coyote_10.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/jakarta-tomcat-connectors-coyote_10.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jakarta-tomcat-connectors-coyote_10.xml 27 Jan 2003 08:31:56 -0000 1.2
+++ jakarta-tomcat-connectors-coyote_10.xml 27 Jan 2003 09:00:52 -0000 1.3
@@ -7,6 +7,10 @@
<cvs repository="jakarta" module="jakarta-tomcat-connectors"/>
+ <project name="jakarta-tomcat-connectors-coyote_10">
+ <!-- dummy to provide a "home" reference for the tomcat-catalina build -->
+ </project>
+
<project name="jakarta-tomcat-util-coyote_10">
<package>org.apache.tomcat.util</package>
<ant basedir="util">
1.48 +7 -5 jakarta-gump/java/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/jakarta-gump/java/Project.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Project.java 16 Jan 2003 14:53:03 -0000 1.47
+++ Project.java 27 Jan 2003 09:00:52 -0000 1.48
@@ -608,8 +608,10 @@
value = project.get("home") + "/" + jar.getAttribute("name");
property.setAttribute("type", "path");
} else if (reference.equals("srcdir")) {
- Module module = Module.find(projectName);
- require (module, "module", projectName);
+ Project project = (Project) projects.get(projectName);
+ require (project, "project", projectName);
+ Module module = Module.find(project.get("module"));
+ require (module, "module containing project", projectName);
value = module.getSrcDir();
property.setAttribute("type", "path");
} else if (property.getAttributeNode("path") != null) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
