Browse Source

Description implementation ( as a regular task ).

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273453 13f79535-47bb-0310-9956-ffa450edef68
master
Costin Manolache 22 years ago
parent
commit
32e4c2da9a
4 changed files with 96 additions and 2 deletions
  1. +1
    -0
      proposal/embed/build.xml
  2. +3
    -1
      proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java
  3. +91
    -0
      proposal/embed/src/java/org/apache/tools/ant/taskdefs/Description.java
  4. +1
    -1
      proposal/embed/test.xml

+ 1
- 0
proposal/embed/build.xml View File

@@ -1,4 +1,5 @@
<project name="embed" default="main" basedir=".">
<description>Embed proposal</description>
<property file="${user.home}/build.properties" />

<property name="base.path" location="/usr/share/java"/>


+ 3
- 1
proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java View File

@@ -103,6 +103,8 @@ public class ProjectHelperImpl2 extends ProjectHelper {
try {
Class c=Class.forName("org.apache.tools.ant.taskdefs.SystemPath");
project.addTaskDefinition( "systemPath" , c );
c=Class.forName("org.apache.tools.ant.taskdefs.Description");
project.addTaskDefinition( "description" , c );
c=Class.forName("org.apache.tools.ant.taskdefs.Import");
project.addTaskDefinition( "import" , c );
c=Class.forName("org.apache.tools.ant.taskdefs.Taskdef2");
@@ -142,7 +144,6 @@ public class ProjectHelperImpl2 extends ProjectHelper {
AntXmlContext context=handler.context;

System.err.println("Parsing with PH2: " + source );
if(source instanceof File) {
context.buildFile=(File)source;
// } else if( source instanceof InputStream ) {
@@ -173,6 +174,7 @@ public class ProjectHelperImpl2 extends ProjectHelper {
inputStream = new FileInputStream(context.buildFile);
inputSource = new InputSource(inputStream);
inputSource.setSystemId(uri);
System.err.println("Parsing with PH2: " + context.buildFile);
project.log("parsing buildfile " + context.buildFile + " with URI = " + uri, Project.MSG_VERBOSE);

DefaultHandler hb = handler;


+ 91
- 0
proposal/embed/src/java/org/apache/tools/ant/taskdefs/Description.java View File

@@ -0,0 +1,91 @@
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Ant", 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 apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/

package org.apache.tools.ant.taskdefs;

import org.apache.tools.ant.*;
import org.apache.tools.ant.types.*;

import java.io.*;
import java.util.*;

/**
* Description task. If top level tasks are executed during processing, import
* and description can be regular tasks, with no need for special code in processor.
*
* ( this only works for top-level descr. AFAIK that's how it works in ant1.5 )
* If this would be extended for <description> elements in targets - a special
* construct would be needed to mark this as 'parsing time' task.
*
* @author Costin Manolache
*/
public class Description extends Task {
String descr;
public Description() {
}

public String getDescription() {
return descr;
}

public void addText( String text ) {
this.descr=text;
}

public void execute() throws BuildException {
project.setDescription( descr );
}
}


+ 1
- 1
proposal/embed/test.xml View File

@@ -1,6 +1,6 @@
<project name="embed-test" default="main" basedir=".">
<property name="ant.src" location="../.."/>
<description>Test for embed proposal</description>
<import file="build.xml"/>

<!-- This is a tricky problem: import will append tasks at the


Loading…
Cancel
Save