You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by eh...@apache.org on 2002/03/03 13:36:44 UTC
cvs commit: jakarta-ant/proposal/sandbox/antlib/src/main/org/apache/tools/ant/taskdefs Ant.java Antjar.java
ehatcher 02/03/03 04:36:44
Modified: proposal/sandbox/antlib/src/main/org/apache/tools/ant/taskdefs
Ant.java Antjar.java
Log:
once again for Jose Alberto - think I got it right this time
Revision Changes Path
1.4 +1 -23 jakarta-ant/proposal/sandbox/antlib/src/main/org/apache/tools/ant/taskdefs/Ant.java
Index: Ant.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/sandbox/antlib/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Ant.java 2 Mar 2002 22:21:19 -0000 1.3
+++ Ant.java 3 Mar 2002 12:36:44 -0000 1.4
@@ -138,10 +138,8 @@
}
public void init() {
- newProject = new Project(project);
+ newProject = project.createSubProject();
newProject.setJavaVersionProperty();
-// newProject.addTaskDefinition("property",
-// (Class)project.getTaskDefinitions().get("property"));
}
private void reinit() {
@@ -184,26 +182,6 @@
log( "Ant: Can't set output to " + output );
}
}
-
-// Hashtable taskdefs = project.getTaskDefinitions();
-// Enumeration et = taskdefs.keys();
-// while (et.hasMoreElements()) {
-// String taskName = (String) et.nextElement();
-// if (taskName.equals("property")) {
-// // we have already added this taskdef in #init
-// continue;
-// }
-// Class taskClass = (Class) taskdefs.get(taskName);
-// newProject.addTaskDefinition(taskName, taskClass);
-// }
-
-// Hashtable typedefs = project.getDataTypeDefinitions();
-// Enumeration e = typedefs.keys();
-// while (e.hasMoreElements()) {
-// String typeName = (String) e.nextElement();
-// Class typeClass = (Class) typedefs.get(typeName);
-// newProject.addDataTypeDefinition(typeName, typeClass);
-// }
// set user-defined or all properties from calling project
Hashtable prop1;
1.3 +9 -5 jakarta-ant/proposal/sandbox/antlib/src/main/org/apache/tools/ant/taskdefs/Antjar.java
Index: Antjar.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/sandbox/antlib/src/main/org/apache/tools/ant/taskdefs/Antjar.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Antjar.java 11 Feb 2002 03:39:00 -0000 1.2
+++ Antjar.java 3 Mar 2002 12:36:44 -0000 1.3
@@ -104,7 +104,8 @@
public void setAntxml(File descriptor) {
libraryDescriptor = descriptor;
if (!libraryDescriptor.exists()) {
- throw new BuildException("Deployment descriptor: " + libraryDescriptor + " does not exist.");
+ throw new BuildException("Deployment descriptor: " +
+ libraryDescriptor + " does not exist.");
}
// Create a ZipFileSet for this file, and pass it up.
@@ -127,7 +128,8 @@
throws IOException, BuildException {
// If no antxml file is specified, it's an error.
if (libraryDescriptor == null) {
- throw new BuildException("antxml attribute is required", location);
+ throw new BuildException("antxml attribute is required",
+ location);
}
super.initZipOutputStream(zOut);
@@ -149,10 +151,12 @@
// meaning the same file is specified by the "antxml" attribute and in
// a <fileset> element.
if (vPath.equalsIgnoreCase(Antlib.ANT_DESCRIPTOR)) {
- if (libraryDescriptor == null || !libraryDescriptor.equals(file) || descriptorAdded) {
+ if (libraryDescriptor == null ||
+ !libraryDescriptor.equals(file) || descriptorAdded) {
log("Warning: selected " + archiveType + " files include a " +
- Antlib.ANT_DESCRIPTOR + " which will be ignored " +
- "(please use antxml attribute to " + archiveType + " task)", Project.MSG_WARN);
+ Antlib.ANT_DESCRIPTOR + " which will be ignored " +
+ "(please use antxml attribute to " + archiveType +
+ " task)", Project.MSG_WARN);
}
else {
super.zipFile(file, zOut, vPath);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>