jvanzyl 02/02/13 07:40:08
Modified: src/tdk/task/org/apache/tdk CreatePath.java
CreatePatternSet.java
Log:
- adding ability for CreatePatternSet to work with a list of jars as well
as a set of regexes.
Revision Changes Path
1.4 +11 -2 jakarta-turbine-tdk/src/tdk/task/org/apache/tdk/CreatePath.java
Index: CreatePath.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/task/org/apache/tdk/CreatePath.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CreatePath.java 12 Feb 2002 16:51:16 -0000 1.3
+++ CreatePath.java 13 Feb 2002 15:40:08 -0000 1.4
@@ -111,7 +111,7 @@
* in subsequent tasks that can utilize references to paths.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: CreatePath.java,v 1.3 2002/02/12 16:51:16 jvanzyl Exp $
+ * @version $Id: CreatePath.java,v 1.4 2002/02/13 15:40:08 jvanzyl Exp $
*
*/
public class CreatePath
@@ -176,7 +176,16 @@
{
continue;
}
-
+
+ if (line.startsWith("<non-distributable>"))
+ {
+ String entry[] = StringUtil.split(line,"|",-1);
+ String jar = entry[1];
+ String location = entry[2];
+
+ line = jar;
+ }
+
// Create a new path for this JAR entry. This path will be
// added to the Ant project as a reference so that the 'refid'
// can be used in <classpath> constructs.
1.3 +4 -1
jakarta-turbine-tdk/src/tdk/task/org/apache/tdk/CreatePatternSet.java
Index: CreatePatternSet.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/tdk/task/org/apache/tdk/CreatePatternSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CreatePatternSet.java 12 Feb 2002 21:30:05 -0000 1.2
+++ CreatePatternSet.java 13 Feb 2002 15:40:08 -0000 1.3
@@ -71,7 +71,7 @@
* construct:
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: CreatePatternSet.java,v 1.2 2002/02/12 21:30:05 jvanzyl Exp $
+ * @version $Id: CreatePatternSet.java,v 1.3 2002/02/13 15:40:08 jvanzyl Exp $
*
*/
public class CreatePatternSet
@@ -137,6 +137,9 @@
// exclude = conf/foo.xml
excludesSb.append(StringUtil.split(line,"=",-1)[1]).append(",");
}
+
+ // We have a jar descriptor file
+ includesSb.append(line).append(",");
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
