sanders 02/04/10 18:50:10
Modified: proposal/vindico/src/java/org/apache/alexandria/om
Project.java
Log:
Added support for non-built packages
Revision Changes Path
1.10 +17 -8
jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java
Index: Project.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Project.java 3 Feb 2002 04:25:57 -0000 1.9
+++ Project.java 11 Apr 2002 01:50:09 -0000 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java,v
1.9 2002/02/03 04:25:57 sanders Exp $
- * $Revision: 1.9 $
- * $Date: 2002/02/03 04:25:57 $
+ * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java,v
1.10 2002/04/11 01:50:09 sanders Exp $
+ * $Revision: 1.10 $
+ * $Date: 2002/04/11 01:50:09 $
*
* ====================================================================
*
@@ -29,7 +29,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -73,7 +73,7 @@
* Project provides ...
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.9 $ $Date: 2002/02/03 04:25:57 $
+ * @version $Revision: 1.10 $ $Date: 2002/04/11 01:50:09 $
*/
public class Project {
@@ -222,6 +222,10 @@
helper.attribute("value", "${basedir}/../logs");
helper.element("property", true);
+ helper.attribute("name", "project.module.parent");
+ helper.attribute("value", getParentModule().getName());
+ helper.element("property", true);
+
if (getScript() != null) {
helper.attribute("name", "build.home");
helper.attribute("value", "${basedir}/" + name);
@@ -364,9 +368,14 @@
Iterator iter = jars.values().iterator();
while (iter.hasNext()) {
Jar jar = (Jar) iter.next();
- String location = getParentWorkspace().getBuildPath() + "/" + name;
- if (home != null) {
- location += "/" + home.getNested();
+ String location;
+ if (packageDir != null) {
+ location = packageDir;
+ } else {
+ location = getParentWorkspace().getBuildPath() + "/" + name;
+ if (home != null) {
+ location += "/" + home.getNested();
+ }
}
location += "/" + jar.getName();
helper.attribute("location", location);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
