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 sa...@apache.org on 2002/02/03 02:59:55 UTC
cvs commit: jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om IScript.java Workspace.java
sanders 02/02/02 17:59:55
Modified: proposal/vindico/src/java/org/apache/alexandria/om
IScript.java Workspace.java
Log:
code formatting
Revision Changes Path
1.3 +5 -4 jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/IScript.java
Index: IScript.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/IScript.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IScript.java 31 Jan 2002 16:56:22 -0000 1.2
+++ IScript.java 3 Feb 2002 01:59:55 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/IScript.java,v 1.2 2002/01/31 16:56:22 sanders Exp $
- * $Revision: 1.2 $
- * $Date: 2002/01/31 16:56:22 $
+ * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/IScript.java,v 1.3 2002/02/03 01:59:55 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/03 01:59:55 $
*
* ====================================================================
*
@@ -69,11 +69,12 @@
* <code>Script</code>
*
* @author <a href="mailto:sanders@apache.org">Scott Sanders</a>
- * @version $Revision: 1.2 $ $Date: 2002/01/31 16:56:22 $
+ * @version $Revision: 1.3 $ $Date: 2002/02/03 01:59:55 $
*/
public interface IScript {
public void toXML(XMLHelper helper);
+
public void build(XMLHelper helper);
}
1.7 +18 -17 jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java
Index: Workspace.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Workspace.java 1 Feb 2002 17:24:41 -0000 1.6
+++ Workspace.java 3 Feb 2002 01:59:55 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java,v 1.6 2002/02/01 17:24:41 sanders Exp $
- * $Revision: 1.6 $
- * $Date: 2002/02/01 17:24:41 $
+ * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java,v 1.7 2002/02/03 01:59:55 sanders Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/02/03 01:59:55 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* Represents ...
*
* @author Scott Sanders
- * @version $Revision: 1.6 $ $Date: 2002/02/01 17:24:41 $
+ * @version $Revision: 1.7 $ $Date: 2002/02/03 01:59:55 $
*/
public class Workspace {
@@ -232,7 +232,7 @@
helper.attribute("antfile", "build-" + projectName + ".xml");
helper.attribute("target", "cvs-" + projectName);
helper.attribute("output", logPath + "/" + project.getName() + "-cvs.xml");
- helper.attribute("inheritAll", "false");
+ helper.attribute("inheritAll", "true");
helper.element("ant");
helper.comment("From project: " + cvs.getParentProject().getName());
helper.popElement();
@@ -250,19 +250,20 @@
while (iter.hasNext()) {
Project project = (Project) iter.next();
if ((project.getStatus() == null) && (resolveDependencies(project))) {
- String projectName = project.getName();
- helper.attribute("antfile", "build-" + projectName + ".xml");
- helper.attribute("target", "build-" + projectName);
- helper.attribute("output", logPath + "/" + project.getName() + "-build.xml");
- helper.attribute("inheritAll", "false");
- helper.element("ant");
- if (project.getParentModule() != null) {
- helper.comment("From module: " + project.getParentModule().getName());
- } else {
- helper.comment("From workspace: " + project.getParentWorkspace().getName());
+ if (project.getScript() != null) {
+ String projectName = project.getName();
+ helper.attribute("antfile", "build-" + projectName + ".xml");
+ helper.attribute("target", "build-" + projectName);
+ helper.attribute("output", logPath + "/" + project.getName() + "-build.xml");
+ helper.attribute("inheritAll", "true");
+ helper.element("ant");
+ if (project.getParentModule() != null) {
+ helper.comment("From module: " + project.getParentModule().getName());
+ } else {
+ helper.comment("From workspace: " + project.getParentWorkspace().getName());
+ }
+ helper.popElement();
}
- helper.popElement();
-
project.build(buildPath + "/build-" + project.getName() + ".xml");
project.setStatus(Project.STATUS_BUILT);
finishedProjects.put(project.getName(), project);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>