RE: Ant fileset from list of checked out files (cleartool lsco)
I have implemented this fileset selector. It seems to work. Can we add this to Ant? Before I open an enhancement request, I'd like to get some feedback. Thanks, -Rob Anderson -Original Message- From: Anderson, Rob (Global Trade) [mailto:[EMAIL PROTECTED] Sent: Monday, December 13, 2004 4:34 PM To: user@ant.apache.org; [EMAIL PROTECTED] Subject: Ant fileset from list of checked out files (cleartool lsco) Ant and ClearCase users, I have a need to create a fileset in Ant from the output of cleartool lsco. Does anyone have a custom selector that would create such a fileset in Ant, that you would be willing to share? I am willing to write one to fill my need, but I thought it might be worth asking about first, to avoid reinventing something that has already been done. Also, is there any interest in a selector that would facilitate creating a fileset in Ant from cleartool lsco output? Let me know if you could use this? _ Robert Anderson Sr. System Engineer Nike - Global Trade IT (503) 532-6803 d - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32718] - Cannot determine Ant home from Locator class if path contains umlauts
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32718. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32718 [EMAIL PROTECTED] changed: What|Removed |Added BugsThisDependsOn|8031| Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2004-12-16 22:41 --- Let's call it a duplicate and plan to add the 8031 patch. Then it will be a known issue that you need to use 1.4+ if you have UTF-8 paths. *** This bug has been marked as a duplicate of 8031 *** -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Purpose of FileUtils.close(...)
So what exactly *is* the intention of this method? IMHO, if an
IOException was thrown when some stream was closed, it was probably
for a reason, and probably something is broken, and probably the user
should find out about it - and fix it - rather than have the problem
be permanently suppressed from view. Maybe an exception closing a
stream is harmless, but Ant surely doesn't know this; it could mean
the last few Kb did not get flushed to disk, for example. E.g. I often
see in Ant code like this (roughly adopted from
ChangeLogTask.writeChangelog):
1.
My intention was only to uniform the codebase around the helper methods
that were presumably created for this sort of task. If you originally
swallow the exception (especially IOException - which I agree should be
reported somewhere, but currently aren't), but with a finally block that
first tests for null and then tries to close() stream/reader - and this
can be replaced by one line FileUtils.close(), then surely this is more
readable?
OutputStream os = null;
try {
os = new FileOutputStream(...);
printStuffToStream(os);
} catch (IOException e) {
throw new BuildException(e);
} finally {
FileUtils.close(os);
}
2.
This follows the standard that I was aware of
1 try to do something
2 catch any exceptions and handle them gracefully
3 finally ensure that the program is in a state where we can continue or
shutdown without breaking anything else
To my mind this is both harder to follow the flow of, and less robust
than, the straightforward version:
try {
OutputStream os = new FileOutputStream(...);
try {
printStuffToStream(os);
} finally {
os.close();
}
} catch (IOException e) {
throw new BuildException(e);
}
3.
when does finally get called? After the inner try, or at the end of the
outer try block? Reading the spec only says that the VM honours the
fact that finally will always be called before returning back up the
call tree. Certain VM's could handle this differently (although I'm
pretty sure they'd all just execute the inner stuff first).
IMHO this structure is less clear than the one above.
Here it is obvious than any IOException's get reported, and that an
OutputStream will always be closed if it ever got created. You don't
need any special utility method, or any dummy initial null value. You
can even make the local var final if that floats your boat.
4.
The utility method is designed to swallow the exception and not report
it. So the rational of these changes is that you care about catching
IOExceptions in the general body of the code (FileNotFound etc etc), but
you don't want to report an exception when you're trying to clean up in
the finally method, as any exceptions would have already been reported
and indeed the stream etc would probably have been closed anyway, the
finally is simply used as a sanity check.
for example
private Class findClassInComponents(String name)
throws ClassNotFoundException {
// we need to search the components of the path to see if
// we can find the class we want.
InputStream stream = null;
String classFilename = getClassFilename(name);
try {
Enumeration e = pathComponents.elements();
while (e.hasMoreElements()) {
File pathComponent = (File) e.nextElement();
try {
stream = getResourceStream(pathComponent,
classFilename);
if (stream != null) {
log(Loaded from + pathComponent +
+ classFilename, Project.MSG_DEBUG);
return getClassFromStream(stream, name,
pathComponent);
}
} catch (SecurityException se) {
throw se;
} catch (IOException ioe) {
// ioe.printStackTrace();
log(Exception reading component + pathComponent
+ (reason: + ioe.getMessage() + ),
Project.MSG_VERBOSE);
}
}
throw new ClassNotFoundException(name);
} finally {
try {
if (stream != null) {
stream.close();
}
} catch (IOException e) {
//ignore
}
}
}
Here the logging of any exceptions happens as normal and then in the
finally we just want to make sure that the stream is closed.
Unfortunately as the close method throws IOException, we have to have
yet another try/catch when we don't care about the exception at all.
FileUtils simply provides a tidier way of acheiveing this.
Is it a good thing to simply swallow exceptions? That's a whole other
story and I can see both sides of the argument but I'll sit on the fence ;).
When there is more than one thing to be closed - e.g. an InputStream
and an OutputStream - using nested try-finally blocks makes it clearer
that
[Patch] style changes + javadoc RCSFile
1659 outstanding errors/warnings...
Index: RCSFile.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java,v
retrieving revision 1.9
diff -u -r1.9 RCSFile.java
--- RCSFile.java9 Mar 2004 16:48:14 - 1.9
+++ RCSFile.java17 Dec 2004 03:12:44 -
@@ -18,43 +18,65 @@
/**
* Represents a RCS File change.
- *
* @version $Revision: 1.9 $ $Date: 2004/03/09 16:48:14 $
*/
-class RCSFile {
-private String m_name;
-private String m_revision;
-private String m_previousRevision;
+public class RCSFile {
+private String name;
+private String revision;
+private String previousRevision;
-RCSFile(final String name, final String rev) {
+/**
+ * Constructor for RCSFile
+ * @param name name of file
+ * @param rev revision
+ */
+public RCSFile(final String name, final String rev) {
this(name, rev, null);
}
-RCSFile(final String name,
+/**
+ * Constructor for RCSFile
+ * @param name name of file
+ * @param revision revision
+ * @param previousRevision previous revision
+ */
+public RCSFile(final String name,
final String revision,
final String previousRevision) {
-m_name = name;
-m_revision = revision;
+this.name = name;
+this.revision = revision;
if (!revision.equals(previousRevision)) {
-m_previousRevision = previousRevision;
+this.previousRevision = previousRevision;
}
}
-String getName() {
-return m_name;
+/**
+ * Gets the RCSFile's name
+ * @return the name of the RCSFile
+ */
+public String getName() {
+return name;
}
-String getRevision() {
-return m_revision;
+/**
+ * Gets the RCSFile's revision
+ * @return the revision of the RCSFile
+ */
+public String getRevision() {
+return revision;
}
-String getPreviousRevision() {
-return m_previousRevision;
+/**
+ * Gets the RCSFile's previous revision
+ * @return the previous revision of the RCSFile
+ */
+public String getPreviousRevision() {
+return previousRevision;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[Patch] ChangeLogParser - hiding field
removed extra LOC from javadoc whilst I was there - no warnings about
the whole cvslib now!! (have to make teh compiler even more strict ;) )
Index: ChangeLogParser.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java,v
retrieving revision 1.28
diff -u -r1.28 ChangeLogParser.java
--- ChangeLogParser.java6 Dec 2004 17:35:42 - 1.28
+++ ChangeLogParser.java17 Dec 2004 03:19:53 -
@@ -28,7 +28,7 @@
*
* @version $Revision: 1.28 $ $Date: 2004/12/06 17:35:42 $
*/
-class ChangeLogParser {
+public class ChangeLogParser {
//private static final int GET_ENTRY = 0;
private static final int GET_FILE = 1;
private static final int GET_DATE = 2;
@@ -60,7 +60,6 @@
/**
* Get a list of rcs entries as an array.
- *
* @return a list of rcs entries as an array
*/
public CVSEntry[] getEntrySetAsArray() {
@@ -110,7 +109,6 @@
/**
* Process a line while in GET_COMMENT state.
- *
* @param line the line
*/
private void processComment(final String line) {
@@ -136,7 +134,6 @@
/**
* Process a line while in GET_FILE state.
- *
* @param line the line to process
*/
private void processFile(final String line) {
@@ -148,7 +145,6 @@
/**
* Process a line while in REVISION state.
- *
* @param line the line to process
*/
private void processRevision(final String line) {
@@ -183,7 +179,6 @@
/**
* Process a line while in GET_PREVIOUS_REVISION state.
- *
* @param line the line to process
*/
private void processGetPreviousRevision(final String line) {
@@ -217,13 +212,12 @@
/**
* Parse date out from expected format.
- *
- * @param date the string holding date
+ * @param pDate the string holding date
* @return the date object or null if unknown date format
*/
-private Date parseDate(final String date) {
+private Date parseDate(final String pDate) {
try {
-return INPUT_DATE.parse(date);
+return INPUT_DATE.parse(pDate);
} catch (ParseException e) {
//final String message = REZ.getString(
changelog.bat-date.error, date );
//getContext().error( message );
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[Patch] StyleBook var names + javadoc
Index: StyleBook.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java,v
retrieving revision 1.16
diff -u -r1.16 StyleBook.java
--- StyleBook.java 9 Mar 2004 16:48:15 - 1.16
+++ StyleBook.java 17 Dec 2004 04:17:48 -
@@ -31,12 +31,16 @@
* @todo stop extending from Java.
*/
public class StyleBook extends Java {
-protected File m_targetDirectory;
-protected File m_skinDirectory;
-protected String m_loaderConfig;
-protected File m_book;
+protected File targetDirectory;
+protected File skinDirectory;
+protected String loaderConfig;
+protected File book;
+/**
+ * Constructor for StyleBook
+ * calls setX methods to configure
+ */
public StyleBook() {
setClassname(org.apache.stylebook.StyleBook);
setFork(true);
@@ -46,61 +50,65 @@
/**
* The book xml file that the documentation generation starts from;
* required.
+ * @param book the xml file that is needed to generate the documentation
*/
public void setBook(final File book) {
-m_book = book;
+this.book = book;
}
/**
- * the directory that contains the stylebook skin;
+ * The directory that contains the stylebook skin;
* required.
+ * @param directory the directory that contains the stylebook skin
*/
public void setSkinDirectory(final File skinDirectory) {
-m_skinDirectory = skinDirectory;
+this.skinDirectory = skinDirectory;
}
/**
- * the destination directory where the documentation is generated;
+ * The destination directory where the documentation is generated;
* required.
+ * @param targetDirectory the location of the generated docs
*/
public void setTargetDirectory(final File targetDirectory) {
-m_targetDirectory = targetDirectory;
+this.targetDirectory = targetDirectory;
}
/**
* A loader configuration to send to stylebook; optional.
+ * @param loaderConfig to pass to the stylebook
*/
public void setLoaderConfig(final String loaderConfig) {
-m_loaderConfig = loaderConfig;
+this.loaderConfig = loaderConfig;
}
/**
- * call the program
+ * Call the program
*/
public void execute()
throws BuildException {
-if (null == m_targetDirectory) {
+if (null == targetDirectory) {
throw new BuildException(TargetDirectory attribute not set.);
}
-if (null == m_skinDirectory) {
+if (null == skinDirectory) {
throw new BuildException(SkinDirectory attribute not set.);
}
-if (null == m_book) {
+if (null == book) {
throw new BuildException(book attribute not set.);
}
-createArg().setValue(targetDirectory= + m_targetDirectory);
-createArg().setValue(m_book.toString());
-createArg().setValue(m_skinDirectory.toString());
-if (null != m_loaderConfig) {
-createArg().setValue(loaderConfig= + m_loaderConfig);
+createArg().setValue(targetDirectory= + targetDirectory);
+createArg().setValue(book.toString());
+createArg().setValue(skinDirectory.toString());
+if (null != loaderConfig) {
+createArg().setValue(loaderConfig= + loaderConfig);
}
super.execute();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP@brutus]: Project test-ant (in module ant) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project test-ant has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - test-ant : Java based build tool Full details are available at: http://brutus.apache.org/gump/public/ant/test-ant/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://brutus.apache.org/gump/public/ant/test-ant/gump_work/build_ant_test-ant.html Work Name: build_ant_test-ant (Type: Build) Work ended in a state of : Failed Elapsed: 6 mins 38 secs Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar:/usr/local/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/serializer.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar org.apache.tools.ant.Main -Dgump.merge=/home/gump/workspaces2/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dtest.haltonfailure=false -Dant.home=/usr/local/gump/public/workspace/ant/dist run-tests [Working Directory: /usr/local/gump/public/workspace/ant] CLASSPATH:
Question Title: ANT -- Directory access problem
Hi All, I know the following is valid syntax and also works fine in my case. project name=MyProject default=dist basedir=. description simple example build file /description /project But i have different scenario. Say I have a project called in MyProect in root direectory and it contains sub directory called MyTest, something like c:/MyProject/MyTest and also it contains c:/MyProject/src now placing my build.xml in c:/MyProject/MyTest foloder I wanted to compile tje files of c:/MyProject/src By giving explicitly the value of basedir as /MyProject, I can make build.xml to work. But I wanted to access the value of /MyProject/src dynamically. I have tried basedir./ and basedir=/./ both doesnot work. So, Please let me know other solutions, if it is possible Thanks sudhakar - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[Patch] TaskLogger variable names + javadoc
Index: TaskLogger.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/util/TaskLogger.java,v
retrieving revision 1.9
diff -u -r1.9 TaskLogger.java
--- TaskLogger.java 9 Mar 2004 16:48:52 - 1.9
+++ TaskLogger.java 17 Dec 2004 06:42:03 -
@@ -20,37 +20,60 @@
import org.apache.tools.ant.Task;
/**
- * A facade that makes logging nicers to use.
- *
+ * A facade that makes logging nicer to use.
* @version $Revision: 1.9 $ $Date: 2004/03/09 16:48:52 $
*/
public final class TaskLogger {
/**
* Task to use to do logging.
*/
-private Task m_task;
+private Task task;
+/**
+ * Constructor for the TaskLogger
+ * @param task the task
+ */
public TaskLogger(final Task task) {
-this.m_task = task;
+this.task = task;
}
+/**
+ * Log a message with codeMSG_INFO/code priority
+ * @param message the message to log
+ */
public void info(final String message) {
-m_task.log(message, Project.MSG_INFO);
+task.log(message, Project.MSG_INFO);
}
+/**
+ * Log a message with codeMSG_ERR/code priority
+ * @param message the message to log
+ */
public void error(final String message) {
-m_task.log(message, Project.MSG_ERR);
+task.log(message, Project.MSG_ERR);
}
+/**
+ * Log a message with codeMSG_WARN/code priority
+ * @param message the message to log
+ */
public void warning(final String message) {
-m_task.log(message, Project.MSG_WARN);
+task.log(message, Project.MSG_WARN);
}
+/**
+ * Log a message with codeMSG_VERBOSE/code priority
+ * @param message the message to log
+ */
public void verbose(final String message) {
-m_task.log(message, Project.MSG_VERBOSE);
+task.log(message, Project.MSG_VERBOSE);
}
+/**
+ * Log a message with codeMSG_DEBUG/code priority
+ * @param message the message to log
+ */
public void debug(final String message) {
-m_task.log(message, Project.MSG_DEBUG);
+task.log(message, Project.MSG_DEBUG);
}
}
Index: JavaVersionTest.java
===
RCS file: JavaVersionTest.java
diff -N JavaVersionTest.java
--- /dev/null 1 Jan 1970 00:00:00 -
+++ JavaVersionTest.java1 Jan 1970 00:00:00 -
@@ -0,0 +1,60 @@
+/*
+ * Created on 16-Dec-2004
+ *
+ */
+package org.apache.tools.ant.util;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * @author it-kevin
+ */
+public class JavaVersionTest extends TestCase {
+
+ /*
+* @see TestCase#setUp()
+*/
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ /*
+* @see TestCase#tearDown()
+*/
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ /**
+* Constructor for JavaVersionTest.
+* @param name
+*/
+ public JavaVersionTest(String name) {
+ super(name);
+ }
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new JavaVersionTest(testVersionJDK14));
+ return suite;
+ }
+
+ public void testVersionJDK14() {
+ try {
+ boolean version = false;
+ if
((!JavaEnvUtils.getJavaVersion().equals(JavaEnvUtils.JAVA_1_2))
+
(!JavaEnvUtils.getJavaVersion().equals(JavaEnvUtils.JAVA_1_3))
+
(!JavaEnvUtils.getJavaVersion().equals(JavaEnvUtils.JAVA_1_1))
+
(!JavaEnvUtils.getJavaVersion().equals(JavaEnvUtils.JAVA_1_0))) {
+ version = true;
+ }
+ assertTrue(version);
+ System.out.println(System.getProperty(java.version));
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ }
+ }
+}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32745] New: - JUnitReport does not handle multiple reports from the same testcase.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32745. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32745 Summary: JUnitReport does not handle multiple reports from the same testcase. Product: Ant Version: 1.6.2 Platform: PC OS/Version: Linux Status: NEW Severity: major Priority: P1 Component: Optional Tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I'm generating junit reports with a specific file name that contains a timestamp. In that case, it is possible that multiple runs of the same testcase is refered in the junitreport fileset. The global TESTS-TestSuites.xml is OK. (Contains Test#1, Test#2, Test#3) But the HTML report (package summary): - shows correctly a line per testcase run (Test#1, Test#2, Test#3) - but all links point to a unique testcase page (Test#3 for instance) -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/testcases/org/apache/tools/ant/types/selectors ModifiedSelectorTest.java
On 16 Dec 2004, [EMAIL PROTECTED] wrote:
Jikes again: shadows, some private finals that could be static and
statics used as instance methods
Is not the full truth since I accidentially committed files I didn't
intend to commit - this time.
The other part (see below) is: Move Kaffe detection to JavaEnvUtils.
Stefan
Index: Path.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/Path.java,v
retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65
-r1.66 --- Path.java 7 Dec 2004 22:14:13 - 1.65
+++ Path.java 16 Dec 2004 14:01:37 - 1.66
@@ -574,7 +574,7 @@
* Add the Java Runtime classes to this Path instance.
*/
public void addJavaRuntime() {
-if (Kaffe.equals(System.getProperty(java.vm.name))) {
+if (JavaEnvUtils.isKaffe()) {
// newer versions of Kaffe (1.1.1+) won't have this,
// but this will be sorted by FileSet anyway.
File kaffeShare = new File(System.getProperty(java.home)
1.23 +20 -0
ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
Index: JavaEnvUtils.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java,v
retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22
-r1.23 --- JavaEnvUtils.java 22 Nov 2004 09:23:37 - 1.22
+++ JavaEnvUtils.java 16 Dec 2004 14:01:37 - 1.23
@@ -67,6 +67,9 @@
/** Version constant for Java 1.5 */
public static final String JAVA_1_5 = 1.5;
+/** Whether this is the Kaffe VM */
+private static boolean kaffeDetected;
+
/** array of packages in the runtime */
private static Vector jrePackages;
@@ -103,6 +106,13 @@
// swallow as we've hit the max class version that
// we have
}
+kaffeDetected = false;
+try {
+Class.forName(kaffe.util.NotImplemented);
+kaffeDetected = true;
+} catch (Throwable t) {
+// swallow as this simply doesn't seem to be Kaffe
+}
}
/**
@@ -123,6 +133,16 @@
*/
public static boolean isJavaVersion(String version) {
return javaVersion.equals(version);
+}
+
+/**
+ * Checks whether the current Java VM is Kaffe.
+ * @return true if the current Java VM is Kaffe.
+ * @since Ant 1.6.3
+ * @see http://www.kaffe.org/
+ */
+public static boolean isKaffe() {
+return kaffeDetected;
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/vss MSVSS.java
peterreilly2004/12/17 02:20:41
Modified:src/main/org/apache/tools/ant/taskdefs/optional/vss Tag:
ANT_16_BRANCH MSVSS.java
Log:
sync
Revision ChangesPath
No revision
No revision
1.34.2.8 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
Index: MSVSS.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java,v
retrieving revision 1.34.2.7
retrieving revision 1.34.2.8
diff -u -r1.34.2.7 -r1.34.2.8
--- MSVSS.java16 Dec 2004 09:50:34 - 1.34.2.7
+++ MSVSS.java17 Dec 2004 10:20:40 - 1.34.2.8
@@ -134,7 +134,7 @@
* @param vssPath The VSS project path.
* @ant.attribute group=required
*/
-public final void setVsspath(String vssPath) {
+public final void setVsspath(final String vssPath) {
String projectPath;
if (vssPath.startsWith(vss://)) { //$NON-NLS-1$
projectPath = vssPath.substring(5);
@@ -143,9 +143,9 @@
}
if (projectPath.startsWith(PROJECT_PREFIX)) {
-vssPath = projectPath;
+this.vssPath = projectPath;
} else {
-vssPath = PROJECT_PREFIX + projectPath;
+this.vssPath = PROJECT_PREFIX + projectPath;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/vss MSVSS.java
peterreilly2004/12/17 02:19:20
Modified:src/main/org/apache/tools/ant/taskdefs/optional/vss
MSVSS.java
Log:
opps: shadow setting due to renaming
Revision ChangesPath
1.42 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
Index: MSVSS.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- MSVSS.java16 Dec 2004 09:50:08 - 1.41
+++ MSVSS.java17 Dec 2004 10:19:20 - 1.42
@@ -134,7 +134,7 @@
* @param vssPath The VSS project path.
* @ant.attribute group=required
*/
-public final void setVsspath(String vssPath) {
+public final void setVsspath(final String vssPath) {
String projectPath;
if (vssPath.startsWith(vss://)) { //$NON-NLS-1$
projectPath = vssPath.substring(5);
@@ -143,9 +143,9 @@
}
if (projectPath.startsWith(PROJECT_PREFIX)) {
-vssPath = projectPath;
+this.vssPath = projectPath;
} else {
-vssPath = PROJECT_PREFIX + projectPath;
+this.vssPath = PROJECT_PREFIX + projectPath;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: Question Title: ANT -- Directory access problem
Don't specify basedir in the sub-project build.xml and invoke it via ant/ from a build.xml in the c:\MyProject directory (with basedir .): the sub-project will inherit the main project's basedir (i.e. c:\MyProject). Alternatively, access your source directory via ../src (which seems a bit duff, but workable). Finally, look at the ant/ and subant/ tasks' documentation. Phil :n. On Fri, 2004-12-17 at 05:48, IndianAtTech wrote: Hi All, I know the following is valid syntax and also works fine in my case. project name=MyProject default=dist basedir=. description simple example build file /description /project But i have different scenario. Say I have a project called in MyProect in root direectory and it contains sub directory called MyTest, something like c:/MyProject/MyTest and also it contains c:/MyProject/src now placing my build.xml in c:/MyProject/MyTest foloder I wanted to compile tje files of c:/MyProject/src By giving explicitly the value of basedir as /MyProject, I can make build.xml to work. But I wanted to access the value of /MyProject/src dynamically. I have tried basedir./ and basedir=/./ both doesnot work. So, Please let me know other solutions, if it is possible Thanks sudhakar - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] -- Phil Weighill-Smith [EMAIL PROTECTED] Volantis Systems
Re: [GUMP@brutus]: Project test-ant (in module ant) failed
No, it was a change to MSVSS.java,
changing of m_* to * caused a method parameter to shadow a class field.
(So declaring method parameters as final is A Good Thing!).
Sorry for the inconvience
Peter.
Stefan Bodewig wrote:
seems as if this change yesterday
1.8 +0 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java
Index: MSVSSTest.java
===
RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MSVSSTest.java 9 Mar 2004 16:49:04 - 1.7
+++ MSVSSTest.java 16 Dec 2004 14:01:40 - 1.8
@@ -35,7 +35,6 @@
*/
public class MSVSSTest extends BuildFileTest implements MSVSSConstants {
-private Project project;
private Commandline commandline;
private static final String VSS_SERVER_PATH = server\\vss\\srcsafe.ini;
has broken the test. The problem is, I don't understand why.
Stefan
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32718] - Cannot determine Ant home from Locator class if path contains umlauts
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32718. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32718 --- Additional Comments From [EMAIL PROTECTED] 2004-12-17 12:17 --- I will check if things work on my German Windows as soon as bug #8031 is fixed. BTW: I use JDK 1.4.2 so the 1.4+-solution should work for me. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [Patch] ChangeLogParser - hiding field
On Fri, 17 Dec 2004, Kev Jackson [EMAIL PROTECTED] wrote:
-class ChangeLogParser {
+public class ChangeLogParser {
why?
Stefan
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [Patch] TaskLogger variable names + javadoc
On Fri, 17 Dec 2004, Kev Jackson [EMAIL PROTECTED] wrote: Index: JavaVersionTest.java === RCS file: JavaVersionTest.java I assume this went in by accident, correct? Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [Patch] StyleBook var names + javadoc
On Fri, 17 Dec 2004, Kev Jackson [EMAIL PROTECTED] wrote:
public class StyleBook extends Java {
-protected File m_targetDirectory;
-protected File m_skinDirectory;
-protected String m_loaderConfig;
-protected File m_book;
+protected File targetDirectory;
+protected File skinDirectory;
+protected String loaderConfig;
+protected File book;
Strange as it may seem, strict BWC would forbid us to change them,
since they are protected.
OTOH it is very unlikely that anybody extends the StyleBook task, so
maybe I'm really over-picky here.
Stefan
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [Patch] ChangeLogParser - hiding field
On Fri, 2004-12-17 at 12:29 +0100, Stefan Bodewig wrote:
On Fri, 17 Dec 2004, Kev Jackson [EMAIL PROTECTED] wrote:
-class ChangeLogParser {
+public class ChangeLogParser {
why?
why not? ;)
No really, just habit - company standards where I've worked in past etc.
Changing it can't break BWC as it can only make the class more visible
not less visible.
I suppose it could expose the class more than was intended, but again
the only real rationale for this was that I was looking at the class and
it's completely automatic (for me) to specify an exact access modifier
for everything as shows your exact intentions.
I can understand if there's a problem with changing it and it breaks
stuff, I won't do it again, but I basically was on autopilot for that
particular change.
Also to be fair only a few classes are defined without any modifier - I
assumed this was a historical oddity and was breaking style.
Rambling now ... never mind
Kev
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [Patch] ChangeLogParser - hiding field
On Fri, 17 Dec 2004, kj [EMAIL PROTECTED] wrote: No really, just habit - company standards where I've worked in past etc. Changing it can't break BWC as it can only make the class more visible not less visible. I agree, but it adds BWC problems for the future. I.e. one more classes with fixed method signatures. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP@brutus]: Project test-ant (in module ant) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project test-ant has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - test-ant : Java based build tool Full details are available at: http://brutus.apache.org/gump/public/ant/test-ant/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://brutus.apache.org/gump/public/ant/test-ant/gump_work/build_ant_test-ant.html Work Name: build_ant_test-ant (Type: Build) Work ended in a state of : Failed Elapsed: 6 mins 35 secs Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar:/usr/local/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/serializer.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar org.apache.tools.ant.Main -Dgump.merge=/home/gump/workspaces2/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dtest.haltonfailure=false -Dant.home=/usr/local/gump/public/workspace/ant/dist run-tests [Working Directory: /usr/local/gump/public/workspace/ant] CLASSPATH:
cvs commit: ant/src/main/org/apache/tools/ant/util GlobPatternMapper.java RegexpPatternMapper.java
peterreilly2004/12/17 05:06:35
Modified:src/main/org/apache/tools/ant/util GlobPatternMapper.java
RegexpPatternMapper.java
Log:
add casesensitive and handledirchar to globmapper and regexpmapper
PR: 16686 and 32487
Revision ChangesPath
1.11 +51 -2
ant/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
Index: GlobPatternMapper.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/GlobPatternMapper.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- GlobPatternMapper.java9 Mar 2004 16:48:51 - 1.10
+++ GlobPatternMapper.java17 Dec 2004 13:06:35 - 1.11
@@ -31,6 +31,7 @@
*
*/
public class GlobPatternMapper implements FileNameMapper {
+
/**
* Part of quot;fromquot; pattern before the *.
*/
@@ -61,8 +62,33 @@
*/
protected String toPostfix = null;
+private boolean handleDirChar = false;
+private boolean caseSensitive = true;
+
+/**
+ * Attribute specifing whether to ignore the difference
+ * between / and \ (the two common directory characters).
+ * @param handleDirChar a boolean, default is false.
+ * @since Ant 1.6.3
+ */
+public void setHandleDirChar(boolean handleDirChar) {
+this.handleDirChar = handleDirChar;
+}
+
+/**
+ * Attribute specifing whether to ignore the case difference
+ * in the names.
+ *
+ * @param caseSensitive a boolean, default is false.
+ * @since Ant 1.6.3
+ */
+public void setCaseSensitive(boolean caseSensitive) {
+this.caseSensitive = caseSensitive;
+}
+
/**
* Sets the quot;fromquot; pattern. Required.
+ * @param from a string
*/
public void setFrom(String from) {
int index = from.lastIndexOf(*);
@@ -79,6 +105,7 @@
/**
* Sets the quot;toquot; pattern. Required.
+ * @param to a string
*/
public void setTo(String to) {
int index = to.lastIndexOf(*);
@@ -95,11 +122,13 @@
* Returns null if the source file name doesn't match the
* quot;fromquot; pattern, an one-element array containing the
* translated file otherwise.
+ * @param sourceFileName the filename to map
+ * @return a list of converted filenames
*/
public String[] mapFileName(String sourceFileName) {
if (fromPrefix == null
-|| !sourceFileName.startsWith(fromPrefix)
-|| !sourceFileName.endsWith(fromPostfix)) {
+|| !modifyName(sourceFileName).startsWith(modifyName(fromPrefix))
+||
!modifyName(sourceFileName).endsWith(modifyName(fromPostfix))) {
return null;
}
return new String[] {toPrefix
@@ -110,9 +139,29 @@
/**
* Returns the part of the given string that matches the * in the
* quot;fromquot; pattern.
+ * @param name the source file name
+ * @return the variable part of the name
*/
protected String extractVariablePart(String name) {
return name.substring(prefixLength,
name.length() - postfixLength);
+}
+
+
+/**
+ * modify string based on dir char mapping and case sensitivity
+ * @param name the name to convert
+ * @return the converted name
+ */
+private String modifyName(String name) {
+if (!caseSensitive) {
+name = name.toLowerCase();
+}
+if (handleDirChar) {
+if (name.indexOf('\\') != -1) {
+name = name.replace('\\', '/');
+}
+}
+return name;
}
}
1.15 +35 -2
ant/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
Index: RegexpPatternMapper.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- RegexpPatternMapper.java 9 Mar 2004 16:48:52 - 1.14
+++ RegexpPatternMapper.java 17 Dec 2004 13:06:35 - 1.15
@@ -36,6 +36,34 @@
reg = (new RegexpMatcherFactory()).newRegexpMatcher();
}
+private boolean handleDirChar = false;
+private int regexpOptions = 0;
+
+/**
+ * Attribute specifing whether to ignore the difference
+ * between / and \ (the two common directory characters).
+ * @param handleDirChar a boolean, default is false.
+ * @since Ant 1.6.3
+ */
+public void setHandleDirChar(boolean handleDirChar) {
+this.handleDirChar = handleDirChar;
+}
+
+/**
+ *
cvs commit: ant/src/etc/testcases/types/mappers - New directory
peterreilly2004/12/17 05:18:56 ant/src/etc/testcases/types/mappers - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/types/mappers - New directory
peterreilly2004/12/17 05:20:45 ant/src/testcases/org/apache/tools/ant/types/mappers - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30912] - misleading doc on file name mappers
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30912. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30912 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED OS/Version||All Resolution||FIXED Target Milestone|--- |1.6.3 --- Additional Comments From [EMAIL PROTECTED] 2004-12-17 14:02 --- Fixed in cvs. pathconvert now allows the new built-in mapper names as direct nested elements. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/types/mappers - New directory
peterreilly2004/12/17 05:28:23 ant/src/main/org/apache/tools/ant/types/mappers - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/etc/testcases/types/mappers define.mapperresult.xml globmapper.xml regexpmapper.xml
peterreilly2004/12/17 05:24:38
Added: src/testcases/org/apache/tools/ant/types/mappers
GlobMapperTest.java MapperResult.java
RegexpPatternMapperTest.java
src/etc/testcases/types/mappers define.mapperresult.xml
globmapper.xml regexpmapper.xml
Log:
testcases for new attributes on globmapper and regexpmapper
Revision ChangesPath
1.1
ant/src/testcases/org/apache/tools/ant/types/mappers/GlobMapperTest.java
Index: GlobMapperTest.java
===
/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.tools.ant.types.mappers;
import org.apache.tools.ant.BuildFileTest;
/**
* Testcase for the lt;globmappergt; mapper.
*
*/
public class GlobMapperTest extends BuildFileTest {
public GlobMapperTest(String name) {
super(name);
}
public void setUp() {
configureProject(src/etc/testcases/types/mappers/globmapper.xml);
}
public void testIgnoreCase() {
executeTarget(ignore.case);
}
public void testHandleDirChar() {
executeTarget(handle.dirchar);
}
}
1.1
ant/src/testcases/org/apache/tools/ant/types/mappers/MapperResult.java
Index: MapperResult.java
===
/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.tools.ant.types.mappers;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Mapper;
import org.apache.tools.ant.util.FileNameMapper;
/**
* This is a test task to show the result of a mapper
* on a specific input.
* (Test is not in the name of the class, to make sure that
* it is not treated as a unit test.
*/
public class MapperResult extends Task {
private String failMessage = ;
private String input;
private String output;
private FileNameMapper fileNameMapper;
public void setFailMessage(String failMessage) {
this.failMessage = failMessage;
}
public void setInput(String input) {
this.input = input;
}
public void setOutput(String output) {
this.output = output;
}
public void addConfiguredMapper(Mapper mapper) {
add(mapper.getImplementation());
}
public void add(FileNameMapper fileNameMapper) {
if (this.fileNameMapper != null) {
throw new BuildException(Only one mapper type nested element
allowed);
}
this.fileNameMapper = fileNameMapper;
}
public void execute() {
if (input == null) {
throw new BuildException(Missing attribute 'input');
}
if (output == null) {
throw new BuildException(Missing attribute 'output');
}
if (fileNameMapper == null) {
throw new BuildException(Missing a nested file name mapper type
element);
}
String[] result = fileNameMapper.mapFileName(input);
String flattened;
if (result == null) {
flattened = NULL;
} else {
StringBuffer b = new StringBuffer();
for (int i = 0; i result.length; ++i) {
if (i != 0) {
b.append(|);
}
b.append(result[i]);
}
flattened = b.toString();
}
if (!flattened.equals(output)) {
throw new BuildException(
Encryption?
Hi, I have a question regarding encryption and export control. Does ANT include any SW encryption that restricts export (i.e. special ECCN code)? Regards, Magnus Svensson - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/types defaults.properties FilterChain.java
peterreilly2004/12/17 05:39:45
Modified:src/main/org/apache/tools/ant/types defaults.properties
FilterChain.java
Added: src/main/org/apache/tools/ant/types/mappers
FilterMapper.java
Log:
New mapper - filtermapper.
This is a filterchain applied to the source file names of the
filenamemapper#mapFileName
function.
Revision ChangesPath
1.1
ant/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
Index: FilterMapper.java
===
/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.tools.ant.types.mappers;
import java.io.StringReader;
import java.io.Reader;
import java.util.Vector;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.UnsupportedAttributeException;
import org.apache.tools.ant.filters.util.ChainReaderHelper;
import org.apache.tools.ant.types.FilterChain;
import org.apache.tools.ant.util.FileNameMapper;
import org.apache.tools.ant.util.FileUtils;
/**
* This is a filenamemaper based on a FilterChain.
*/
public class FilterMapper extends FilterChain implements FileNameMapper {
/**
* From attribute not supported.
* @param from a string
* @throws BuildException always
*/
public void setFrom(String from) {
throw new UnsupportedAttributeException(
filtermapper does'nt support the \from\ attribute., from);
}
/**
* From attribute not supported.
* @param to a string
* @throws BuildException always
*/
public void setTo(String to) {
throw new UnsupportedAttributeException(
filtermapper does'nt support the \to\ attribute., to);
}
/**
* Return the result of the filters on the sourcefilename.
* @param sourceFileName the filename to map
* @return a one-element array of converted filenames, or null if
* the filterchain returns an empty string.
*/
public String[] mapFileName(String sourceFileName) {
try {
Reader stringReader = new StringReader(sourceFileName);
ChainReaderHelper helper = new ChainReaderHelper();
helper.setBufferSize(8192);
helper.setPrimaryReader(stringReader);
helper.setProject(getProject());
Vector filterChains = new Vector();
filterChains.add(this);
helper.setFilterChains(filterChains);
String result = FileUtils.readFully(helper.getAssembledReader());
if (result.length() == 0) {
return null;
} else {
return new String[] {result};
}
} catch (BuildException ex) {
throw ex;
} catch (Exception ex) {
throw new BuildException(ex);
}
}
}
1.33 +1 -0
ant/src/main/org/apache/tools/ant/types/defaults.properties
Index: defaults.properties
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/defaults.properties,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- defaults.properties 2 Dec 2004 18:07:44 - 1.32
+++ defaults.properties 17 Dec 2004 13:39:45 - 1.33
@@ -18,6 +18,7 @@
unpackagemapper=org.apache.tools.ant.util.UnPackageNameMapper
compositemapper=org.apache.tools.ant.util.CompositeMapper
chainedmapper=org.apache.tools.ant.util.ChainedMapper
+filtermapper=org.apache.tools.ant.types.mappers.FilterMapper
path=org.apache.tools.ant.types.Path
patternset=org.apache.tools.ant.types.PatternSet
1.18 +1 -1 ant/src/main/org/apache/tools/ant/types/FilterChain.java
Index: FilterChain.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/FilterChain.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- FilterChain.java 9 Mar 2004 16:48:41 - 1.17
+++ FilterChain.java 17 Dec 2004 13:39:45 - 1.18
@@ -40,7 +40,7 @@
* FilterChain
cvs commit: ant/src/main/org/apache/tools/ant/types defaults.properties FilterChain.java
peterreilly2004/12/17 06:09:28
Modified:src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
defaults.properties FilterChain.java
Added: src/main/org/apache/tools/ant/types/mappers Tag:
ANT_16_BRANCH FilterMapper.java
Log:
sync
Revision ChangesPath
No revision
No revision
1.1.2.1 +0 -0
ant/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
Index: FilterMapper.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.19.2.5 +1 -0
ant/src/main/org/apache/tools/ant/types/defaults.properties
Index: defaults.properties
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/defaults.properties,v
retrieving revision 1.19.2.4
retrieving revision 1.19.2.5
diff -u -r1.19.2.4 -r1.19.2.5
--- defaults.properties 23 Jun 2004 19:17:12 - 1.19.2.4
+++ defaults.properties 17 Dec 2004 14:09:28 - 1.19.2.5
@@ -18,6 +18,7 @@
unpackagemapper=org.apache.tools.ant.util.UnPackageNameMapper
compositemapper=org.apache.tools.ant.util.CompositeMapper
chainedmapper=org.apache.tools.ant.util.ChainedMapper
+filtermapper=org.apache.tools.ant.types.mappers.FilterMapper
path=org.apache.tools.ant.types.Path
patternset=org.apache.tools.ant.types.PatternSet
1.13.2.5 +1 -1 ant/src/main/org/apache/tools/ant/types/FilterChain.java
Index: FilterChain.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/FilterChain.java,v
retrieving revision 1.13.2.4
retrieving revision 1.13.2.5
diff -u -r1.13.2.4 -r1.13.2.5
--- FilterChain.java 9 Mar 2004 17:01:54 - 1.13.2.4
+++ FilterChain.java 17 Dec 2004 14:09:28 - 1.13.2.5
@@ -40,7 +40,7 @@
* FilterChain may contain a chained set of filter readers.
*
*/
-public final class FilterChain extends DataType
+public class FilterChain extends DataType
implements Cloneable {
private Vector filterReaders = new Vector();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/types/optional/depend ClassFileSetTest.java
bodewig 2004/12/17 06:12:08
Modified:src/testcases/org/apache/tools/ant/taskdefs FixCrLfTest.java
JarTest.java ZipTest.java
src/testcases/org/apache/tools/ant/taskdefs/optional/junit
Sleeper.java
src/testcases/org/apache/tools/ant/taskdefs/optional/perforce
P4ChangeTest.java
src/testcases/org/apache/tools/ant/taskdefs/optional/script
ScriptDefTest.java
src/testcases/org/apache/tools/ant/types/optional/depend
ClassFileSetTest.java
Log:
More shadows and statics that make Jikes whine
Revision ChangesPath
1.22 +1 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java
Index: FixCrLfTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- FixCrLfTest.java 7 Dec 2004 09:10:38 - 1.21
+++ FixCrLfTest.java 17 Dec 2004 14:12:08 - 1.22
@@ -112,7 +112,7 @@
* granularity (should be 2s to account for Windows FAT).
*/
try {
-Thread.currentThread().sleep(5000);
+Thread.sleep(5000);
} catch (InterruptedException ie) {
fail(ie.getMessage());
} // end of try-catch
1.30 +2 -2
ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
Index: JarTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- JarTest.java 9 Mar 2004 16:48:57 - 1.29
+++ JarTest.java 17 Dec 2004 14:12:08 - 1.30
@@ -96,7 +96,7 @@
File jarFile = new File(getProjectDir(), tempJar);
long jarModifiedDate = jarFile.lastModified();
try {
-Thread.currentThread().sleep(2500);
+Thread.sleep(2500);
} catch (InterruptedException e) {
} // end of try-catch
executeTarget(secondTarget);
@@ -127,7 +127,7 @@
long sleeptime = 3000
+ FileUtils.newFileUtils().getFileTimestampGranularity();
try {
-Thread.currentThread().sleep(sleeptime);
+Thread.sleep(sleeptime);
} catch (InterruptedException e) {
} // end of try-catch
File jarFile = new File(getProjectDir(), tempJar);
1.22 +1 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
Index: ZipTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ZipTest.java 25 Aug 2004 14:56:41 - 1.21
+++ ZipTest.java 17 Dec 2004 14:12:08 - 1.22
@@ -122,7 +122,7 @@
throws InterruptedException {
executeTarget(testFilesOnlyDoesntCauseRecreateSetup);
long l = getProject().resolveFile(test3.zip).lastModified();
-Thread.currentThread().sleep(3000);
+Thread.sleep(3000);
executeTarget(testFilesOnlyDoesntCauseRecreate);
assertEquals(l,
getProject().resolveFile(test3.zip).lastModified());
}
1.3 +2 -2
ant/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/Sleeper.java
Index: Sleeper.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/Sleeper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Sleeper.java 6 Oct 2004 15:01:55 - 1.2
+++ Sleeper.java 17 Dec 2004 14:12:08 - 1.3
@@ -29,7 +29,7 @@
public void testSleep() {
try {
-Thread.currentThread().sleep(5 * 1000);
+Thread.sleep(5 * 1000);
} catch (InterruptedException e) {
} // end of try-catch
}
1.8 +2 -2
ant/src/testcases/org/apache/tools/ant/taskdefs/optional/perforce/P4ChangeTest.java
Index: P4ChangeTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/perforce/P4ChangeTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- P4ChangeTest.java 9 Mar 2004 16:49:03 - 1.7
+++ P4ChangeTest.java 17 Dec 2004 14:12:08 - 1.8
@@ -36,14 +36,14 @@
public void testBackslash(){
String
cvs commit: ant/docs/manual/CoreTypes mapper.html
peterreilly2004/12/17 06:18:31
Modified:docs/manual/CoreTypes mapper.html
Log:
doc for extra attributes for globmapper, regexpmapper
doc for filtermapper
remove reference to optional.jar
PR: 32487, 16686, 28584
Revision ChangesPath
1.20 +183 -10 ant/docs/manual/CoreTypes/mapper.html
Index: mapper.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTypes/mapper.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mapper.html 19 Nov 2004 09:07:10 - 1.19
+++ mapper.html 17 Dec 2004 14:18:31 - 1.20
@@ -239,6 +239,69 @@
td valign=topcodeQlasses/dir/dir2/A.property/code/td
/tr
/table
+ p
+The globmapper mapper can take the following extra attributes.
+ /p
+ table border=1 cellpadding=2 cellspacing=0
+tr
+ td valign=topbAttribute/b/td
+ td valign=topbDescription/b/td
+ td align=center valign=topbRequired/b/td
+/tr
+tr
+ td valign=topcasesensitice/td
+ td valign=top
+If this is false, the mapper will ignore case when matching the glob
pattern.
+This attribute can be true or false, the default is true.
+ emSince ant 1.6.3./em
+ /td
+ td align=center valign=topNo/td
+/tr
+tr
+ td valign=tophandledirchar/td
+ td valign=top
+If this is specified, the mapper will ignore the difference between
the normal
+directory separator characters - \ and /.
+This attribute can be true or false, the default is false.
+This attribute is useful for cross-platform build files.
+emSince ant 1.6.3./em
+td align=center valign=topNo/td
+ /tr
+/table
+p
+ An example:
+/p
+pre
+ lt;pathconvert property=x targetos=unixgt;
+lt;path path=Aj.Java/gt;
+lt;mappergt;
+lt;chainedmappergt;
+ lt;flattenmapper/gt;
+ lt;globmapper from=a*.java to=*.java.bak
casesensitive=no/gt;
+lt;/chainedmappergt;
+lt;/mappergt;
+ lt;/pathconvertgt;
+ lt;echogt;x is ${x}lt;/echogt;
+/pre
+p
+ will output x is j.java.bak.
+/p
+p
+ and
+/p
+pre
+ lt;pathconvert property=x targetos=unixgt;
+lt;path path=d/e/f/j.java/gt;
+lt;mappergt;
+ lt;globmapper from=${basedir}\d/e\* to=*
ignoredirchar=yes/gt;
+lt;/mappergt;
+ lt;/pathconvertgt;
+ lt;echogt;x is ${x}lt;/echogt;
+/pre
+p
+ will output x is f/j.java.
+/p
+
h4a name=regexp-mapperregexp/a/h4
pBoth codeto/code and codefrom/code define regular
expressions. If the source file name matches the codefrom/code
@@ -254,7 +317,7 @@
pThe regexp mapper needs a supporting library and an implementation
of codeorg.apache.tools.ant.util.regexp.RegexpMatcher/code that
hides the specifics of the library. Ant comes with implementations for
-a
href=http://java.sun.com/j2se/1.4/docs/api/java/util/regex/package-summary.html;
target=_topthe java.util.regex package of JDK 1.4/a,
+a
href=http://java.sun.com/j2se/1.4/docs/api/java/util/regex/package-summary.html;
target=_topthe java.util.regex package of JDK 1.4 or higher/a,
a href=http://jakarta.apache.org/regexp/; target=_topjakarta-regexp/a
and a
href=http://jakarta.apache.org/oro/; target=_topjakarta-ORO/a. If you
compile
from sources and plan to use one of them, make sure the libraries are
@@ -263,13 +326,16 @@
href=http://www.crocodile.org/~sts/Rex/; target=_topgnu.rex/a with
Ant, see a
href=http://marc.theaimsgroup.com/?l=ant-devm=97550753813481w=2;
target=_topthis/a
article./p
-pThis means, you need codeoptional.jar/code from the Ant release
-you are using strongand/strong one of the supported regular
-expression libraries. Make sure, both will be loaded from the same
+pThis means, you need one of the supported regular expression
+ libraries strongand/strong
+ the corresponding codeant-[jakarta-oro, jakarta-regexp, apache-oro,
apache-regexp}.jar/code
+from the Ant release you are using.
+Make sure, both will be loaded from the same
classpath, that is either put them into your codeCLASSPATH/code,
codeANT_HOME/lib/code directory or a nested
codelt;classpathgt;/code element of the mapper - you cannot have
-codeoptional.jar/code in codeANT_HOME/lib/code and the library
+codeant-[jakarta-oro, jakarta-regexp, apache-oro,
apache-regexp].jar/code in codeANT_HOME/lib/code
+ and the library
in a nested codelt;classpathgt;/code./p
pAnt will choose the regular-expression library based on the
following algorithm:/p
@@ -337,8 +403,8 @@
/tr
/table
blockquotepre
-lt;mapper type=quot;regexpquot; from=quot;^(.*)\.(.*)$$quot;
cvs commit: ant/docs/manual/CoreTypes mapper.html
peterreilly2004/12/17 06:18:51
Modified:docs/manual/CoreTypes Tag: ANT_16_BRANCH mapper.html
Log:
sync
Revision ChangesPath
No revision
No revision
1.13.2.6 +207 -8ant/docs/manual/CoreTypes/mapper.html
Index: mapper.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTypes/mapper.html,v
retrieving revision 1.13.2.5
retrieving revision 1.13.2.6
diff -u -r1.13.2.5 -r1.13.2.6
--- mapper.html 19 Nov 2004 09:10:03 - 1.13.2.5
+++ mapper.html 17 Dec 2004 14:18:51 - 1.13.2.6
@@ -240,6 +240,69 @@
td valign=topcodeQlasses/dir/dir2/A.property/code/td
/tr
/table
+ p
+The globmapper mapper can take the following extra attributes.
+ /p
+ table border=1 cellpadding=2 cellspacing=0
+tr
+ td valign=topbAttribute/b/td
+ td valign=topbDescription/b/td
+ td align=center valign=topbRequired/b/td
+/tr
+tr
+ td valign=topcasesensitice/td
+ td valign=top
+If this is false, the mapper will ignore case when matching the glob
pattern.
+This attribute can be true or false, the default is true.
+ emSince ant 1.6.3./em
+ /td
+ td align=center valign=topNo/td
+/tr
+tr
+ td valign=tophandledirchar/td
+ td valign=top
+If this is specified, the mapper will ignore the difference between
the normal
+directory separator characters - \ and /.
+This attribute can be true or false, the default is false.
+This attribute is useful for cross-platform build files.
+emSince ant 1.6.3./em
+td align=center valign=topNo/td
+ /tr
+/table
+p
+ An example:
+/p
+pre
+ lt;pathconvert property=x targetos=unixgt;
+lt;path path=Aj.Java/gt;
+lt;mappergt;
+lt;chainedmappergt;
+ lt;flattenmapper/gt;
+ lt;globmapper from=a*.java to=*.java.bak
casesensitive=no/gt;
+lt;/chainedmappergt;
+lt;/mappergt;
+ lt;/pathconvertgt;
+ lt;echogt;x is ${x}lt;/echogt;
+/pre
+p
+ will output x is j.java.bak.
+/p
+p
+ and
+/p
+pre
+ lt;pathconvert property=x targetos=unixgt;
+lt;path path=d/e/f/j.java/gt;
+lt;mappergt;
+ lt;globmapper from=${basedir}\d/e\* to=*
ignoredirchar=yes/gt;
+lt;/mappergt;
+ lt;/pathconvertgt;
+ lt;echogt;x is ${x}lt;/echogt;
+/pre
+p
+ will output x is f/j.java.
+/p
+
h4a name=regexp-mapperregexp/a/h4
pBoth codeto/code and codefrom/code define regular
expressions. If the source file name matches the codefrom/code
@@ -255,7 +318,7 @@
pThe regexp mapper needs a supporting library and an implementation
of codeorg.apache.tools.ant.util.regexp.RegexpMatcher/code that
hides the specifics of the library. Ant comes with implementations for
-a
href=http://java.sun.com/j2se/1.4/docs/api/java/util/regex/package-summary.html;
target=_topthe java.util.regex package of JDK 1.4/a,
+a
href=http://java.sun.com/j2se/1.4/docs/api/java/util/regex/package-summary.html;
target=_topthe java.util.regex package of JDK 1.4 or higher/a,
a href=http://jakarta.apache.org/regexp/; target=_topjakarta-regexp/a
and a
href=http://jakarta.apache.org/oro/; target=_topjakarta-ORO/a. If you
compile
from sources and plan to use one of them, make sure the libraries are
@@ -264,13 +327,16 @@
href=http://www.crocodile.org/~sts/Rex/; target=_topgnu.rex/a with
Ant, see a
href=http://marc.theaimsgroup.com/?l=ant-devm=97550753813481w=2;
target=_topthis/a
article./p
-pThis means, you need codeoptional.jar/code from the Ant release
-you are using strongand/strong one of the supported regular
-expression libraries. Make sure, both will be loaded from the same
+pThis means, you need one of the supported regular expression
+ libraries strongand/strong
+ the corresponding codeant-[jakarta-oro, jakarta-regexp, apache-oro,
apache-regexp}.jar/code
+from the Ant release you are using.
+Make sure, both will be loaded from the same
classpath, that is either put them into your codeCLASSPATH/code,
codeANT_HOME/lib/code directory or a nested
codelt;classpathgt;/code element of the mapper - you cannot have
-codeoptional.jar/code in codeANT_HOME/lib/code and the library
+codeant-[jakarta-oro, jakarta-regexp, apache-oro,
apache-regexp].jar/code in codeANT_HOME/lib/code
+ and the library
in a nested codelt;classpathgt;/code./p
pAnt will choose the regular-expression library based on the
following algorithm:/p
@@ -338,8 +404,8 @@
/tr
/table
blockquotepre
-lt;mapper type=quot;regexpquot; from=quot;^(.*)\.(.*)$$quot;
to=quot;\2.\1quot;/gt;
DO NOT REPLY [Bug 28584] - Regexp-Mapper docs give outdated instructions (optional.jar)
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=28584. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=28584 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Target Milestone|--- |1.6.3 --- Additional Comments From [EMAIL PROTECTED] 2004-12-17 15:21 --- Doc is updated, Thanks -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/util TaskLogger.java
bodewig 2004/12/17 03:37:29
Modified:src/main/org/apache/tools/ant/util TaskLogger.java
Log:
style - by Kevin Jackson
Revision ChangesPath
1.10 +33 -10ant/src/main/org/apache/tools/ant/util/TaskLogger.java
Index: TaskLogger.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/TaskLogger.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TaskLogger.java 9 Mar 2004 16:48:52 - 1.9
+++ TaskLogger.java 17 Dec 2004 11:37:29 - 1.10
@@ -20,37 +20,60 @@
import org.apache.tools.ant.Task;
/**
- * A facade that makes logging nicers to use.
- *
+ * A facade that makes logging nicer to use.
* @version $Revision$ $Date$
*/
public final class TaskLogger {
/**
* Task to use to do logging.
*/
-private Task m_task;
+private Task task;
+/**
+ * Constructor for the TaskLogger
+ * @param task the task
+ */
public TaskLogger(final Task task) {
-this.m_task = task;
+this.task = task;
}
+/**
+ * Log a message with codeMSG_INFO/code priority
+ * @param message the message to log
+ */
public void info(final String message) {
-m_task.log(message, Project.MSG_INFO);
+task.log(message, Project.MSG_INFO);
}
+/**
+ * Log a message with codeMSG_ERR/code priority
+ * @param message the message to log
+ */
public void error(final String message) {
-m_task.log(message, Project.MSG_ERR);
+task.log(message, Project.MSG_ERR);
}
+/**
+ * Log a message with codeMSG_WARN/code priority
+ * @param message the message to log
+ */
public void warning(final String message) {
-m_task.log(message, Project.MSG_WARN);
+task.log(message, Project.MSG_WARN);
}
+/**
+ * Log a message with codeMSG_VERBOSE/code priority
+ * @param message the message to log
+ */
public void verbose(final String message) {
-m_task.log(message, Project.MSG_VERBOSE);
+task.log(message, Project.MSG_VERBOSE);
}
+/**
+ * Log a message with codeMSG_DEBUG/code priority
+ * @param message the message to log
+ */
public void debug(final String message) {
-m_task.log(message, Project.MSG_DEBUG);
+task.log(message, Project.MSG_DEBUG);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant WHATSNEW
peterreilly2004/12/17 06:25:38 Modified:.WHATSNEW Log: update for mapper changes Revision ChangesPath 1.700 +11 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.699 retrieving revision 1.700 diff -u -r1.699 -r1.700 --- WHATSNEW 15 Dec 2004 12:28:29 - 1.699 +++ WHATSNEW 17 Dec 2004 14:25:38 - 1.700 @@ -149,6 +149,14 @@ * rmic now also supports Kaffe's rmic version shipping with Kaffe 1.1.2 and above. +* added casesensitive attribute to globmapper and regexpmapper + Bugzilla report 16686 + +* added handledirchar attribute to globmapper and regexpmapper + Bugzilla report 32487 + +* added a new mapper filtermapper + Fixed bugs: --- @@ -203,6 +211,9 @@ * XMLValidate used URL#getFile rather than the ant method FileUtils#fromURI Bugzilla report 32508 + +* fixed Regexp-Mapper docs which gave outdated instructions (optional.jar) + Bugzilla report 28584 Changes from Ant 1.6.1 to Ant 1.6.2 === - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant WHATSNEW
peterreilly2004/12/17 06:26:03 Modified:.Tag: ANT_16_BRANCH WHATSNEW Log: sync Revision ChangesPath No revision No revision 1.503.2.151 +11 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.503.2.150 retrieving revision 1.503.2.151 diff -u -r1.503.2.150 -r1.503.2.151 --- WHATSNEW 15 Dec 2004 12:31:43 - 1.503.2.150 +++ WHATSNEW 17 Dec 2004 14:26:03 - 1.503.2.151 @@ -32,6 +32,14 @@ * rmic now also supports Kaffe's rmic version shipping with Kaffe 1.1.2 and above. +* added casesensitive attribute to globmapper and regexpmapper + Bugzilla report 16686 + +* added handledirchar attribute to globmapper and regexpmapper + Bugzilla report 32487 + +* added a new mapper filtermapper + Fixed bugs: --- @@ -91,6 +99,9 @@ * XMLValidate used URL#getFile rather than the ant method FileUtils#fromURI Bugzilla report 32508 + +* fixed Regexp-Mapper docs which gave outdated instructions (optional.jar) + Bugzilla report 28584 Changes from Ant 1.6.1 to Ant 1.6.2 === - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 16686] - Add casesensitive attribute to mapper
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=16686. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=16686 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Target Milestone|--- |1.6.3 --- Additional Comments From [EMAIL PROTECTED] 2004-12-17 15:34 --- A casesenitive attribute has been added to globmapper and regexpmapper Sorry for the delay in replying to the bug report. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTypes mapper.html
peterreilly2004/12/17 06:55:47
Modified:docs/manual/CoreTypes mapper.html
Log:
clarify the use of file.separator character for regexpression
Revision ChangesPath
1.21 +6 -1 ant/docs/manual/CoreTypes/mapper.html
Index: mapper.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTypes/mapper.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mapper.html 17 Dec 2004 14:18:31 - 1.20
+++ mapper.html 17 Dec 2004 14:55:47 - 1.21
@@ -66,7 +66,12 @@
pNote that Ant will not automatically convert / or \ characters in
the codeto/code and codefrom/code attributes to the correct
directory separator of your current platform. If you need to specify
-this separator, use code${file.separator}/code instead./p
+this separator, use code${file.separator}/code instead.
+ For the regexpmapper, code${file.separator}/code will not work,
+as on windows it is the '\' character, and this is an escape character
+for regular expressions, one should use the codehandledirchar/code
attribute
+instead.
+/p
h3Parameters specified as nested elements/h3
pThe classpath can be specified via a nested
codelt;classpathgt;/code, as well - that is,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 26901] - regex with file mapper incorrectly handles ${file.separator}
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=26901. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=26901 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Target Milestone|--- |1.6.3 --- Additional Comments From [EMAIL PROTECTED] 2004-12-17 15:58 --- regexpmapper now has a handledirchar attribute. It will allow the '/' in the from attribute to match '\' in file names. One needs to use '/' in the to attribute. The manual how has a note explaining the issue. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTypes mapper.html
peterreilly2004/12/17 06:56:09
Modified:docs/manual/CoreTypes Tag: ANT_16_BRANCH mapper.html
Log:
sync
Revision ChangesPath
No revision
No revision
1.13.2.7 +6 -1 ant/docs/manual/CoreTypes/mapper.html
Index: mapper.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTypes/mapper.html,v
retrieving revision 1.13.2.6
retrieving revision 1.13.2.7
diff -u -r1.13.2.6 -r1.13.2.7
--- mapper.html 17 Dec 2004 14:18:51 - 1.13.2.6
+++ mapper.html 17 Dec 2004 14:56:09 - 1.13.2.7
@@ -67,7 +67,12 @@
pNote that Ant will not automatically convert / or \ characters in
the codeto/code and codefrom/code attributes to the correct
directory separator of your current platform. If you need to specify
-this separator, use code${file.separator}/code instead./p
+this separator, use code${file.separator}/code instead.
+ For the regexpmapper, code${file.separator}/code will not work,
+as on windows it is the '\' character, and this is an escape character
+for regular expressions, one should use the codehandledirchar/code
attribute
+instead.
+/p
h3Parameters specified as nested elements/h3
pThe classpath can be specified via a nested
codelt;classpathgt;/code, as well - that is,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27980] - mapper inside zip
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=27980. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=27980 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2004-12-17 16:03 --- *** This bug has been marked as a duplicate of 19523 *** -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 19523] - zip/unzip should have the capability to use a mapper
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=19523. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=19523 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2004-12-17 16:03 --- *** Bug 27980 has been marked as a duplicate of this bug. *** -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
AW: Encryption?
AFAIK Ant doesnt include any encryption algorithms. It uses the standard APIs from java.security (checksum, modified) or java.util.zip (modified) package. Or they use JDK tools (signjar). Jan -Ursprüngliche Nachricht- Von: Magnus Svensson (HF/EAB) [mailto:[EMAIL PROTECTED] Gesendet am: Freitag, 17. Dezember 2004 14:29 An: '[EMAIL PROTECTED]' Betreff: Encryption? Hi, I have a question regarding encryption and export control. Does ANT include any SW encryption that restricts export (i.e. special ECCN code)? Regards, Magnus Svensson - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32487] - updatedate mapper requires OS-specific slashes
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32487. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32487 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Target Milestone|--- |1.6.3 --- Additional Comments From [EMAIL PROTECTED] 2004-12-17 15:32 --- globmapper and regexpmapper have been updated to have casesensitive (default true) and handledirchar (default false) attributes. It was the consenses on ant-dev (well 2.5 votes to 0.5) that the handledirchar should be explicitly turned on. This will be in ant 1.6.3. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32487] - updatedate mapper requires OS-specific slashes
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32487. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32487 --- Additional Comments From [EMAIL PROTECTED] 2004-12-17 18:23 --- Peter, What is the benefit of having to explicitly turn handledirchar on? What is the danger of having it on by default? Gili -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: New selector for creating a fileset. How do I use it?
On Wed, 15 Dec 2004, Rob Anderson [EMAIL PROTECTED] wrote: I have written a new selector for creating a fileset. This selector will select files that are checked out of clearcase. How do I configure Ant to recognize my new selector? typedef it. Stefan Thanks. It works. Now I need to add some more features and clean it up a little. Any interest in adding this to Ant? (Please say yes.) -Rob Anderson - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/util/regexp JakartaOroMatcher.java JakartaOroRegexp.java JakartaRegexpMatcher.java JakartaRegexpRegexp.java Jdk14RegexpMatcher.java Jdk14RegexpRegexp.java Regexp.java RegexpFactory.java RegexpMatcher.java RegexpMatcherFactory.java RegexpUtil.java
peterreilly2004/12/17 11:46:05
Modified:src/main/org/apache/tools/ant/util/regexp
JakartaOroMatcher.java JakartaOroRegexp.java
JakartaRegexpMatcher.java JakartaRegexpRegexp.java
Jdk14RegexpMatcher.java Jdk14RegexpRegexp.java
Regexp.java RegexpFactory.java RegexpMatcher.java
RegexpMatcherFactory.java RegexpUtil.java
Log:
checkstyle
Revision ChangesPath
1.18 +32 -2
ant/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
Index: JakartaOroMatcher.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JakartaOroMatcher.java9 Mar 2004 16:48:54 - 1.17
+++ JakartaOroMatcher.java17 Dec 2004 19:46:04 - 1.18
@@ -34,11 +34,15 @@
protected final Perl5Compiler compiler = new Perl5Compiler();
protected final Perl5Matcher matcher = new Perl5Matcher();
+/**
+ * Constructor for JakartaOroMatcher.
+ */
public JakartaOroMatcher() {
}
/**
* Set the regexp pattern from the String description.
+ * @param pattern the pattern to match
*/
public void setPattern(String pattern) {
this.pattern = pattern;
@@ -46,6 +50,7 @@
/**
* Get a String representation of the regexp pattern
+ * @return the pattern
*/
public String getPattern() {
return this.pattern;
@@ -53,6 +58,9 @@
/**
* Get a compiled representation of the regexp pattern
+ * @param options the options
+ * @return the compiled pattern
+ * @throws BuildException on error
*/
protected Pattern getCompiledPattern(int options)
throws BuildException {
@@ -66,7 +74,10 @@
}
/**
- * Does the given argument match the pattern?
+ * Does the given argument match the pattern using default options?
+ * @param argument the string to match against
+ * @return true if the pattern matches
+ * @throws BuildException on error
*/
public boolean matches(String argument) throws BuildException {
return matches(argument, MATCH_DEFAULT);
@@ -74,6 +85,10 @@
/**
* Does the given argument match the pattern?
+ * @param input the string to match against
+ * @param options the regex options to use
+ * @return true if the pattern matches
+ * @throws BuildException on error
*/
public boolean matches(String input, int options)
throws BuildException {
@@ -82,10 +97,15 @@
}
/**
- * Returns a Vector of matched groups found in the argument.
+ * Returns a Vector of matched groups found in the argument
+ * using default options.
*
* pGroup 0 will be the full match, the rest are the
* parenthesized subexpressions/p.
+ *
+ * @param argument the string to match against
+ * @return the vector of groups
+ * @throws BuildException on error
*/
public Vector getGroups(String argument) throws BuildException {
return getGroups(argument, MATCH_DEFAULT);
@@ -96,6 +116,11 @@
*
* pGroup 0 will be the full match, the rest are the
* parenthesized subexpressions/p.
+ *
+ * @param input the string to match against
+ * @param options the regex options to use
+ * @return the vector of groups
+ * @throws BuildException on error
*/
public Vector getGroups(String input, int options)
throws BuildException {
@@ -116,6 +141,11 @@
return v;
}
+/**
+ * Convert the generic options to the regex compiler specific options.
+ * @param options the generic options
+ * @return the specific options
+ */
protected int getCompilerOptions(int options) {
int cOptions = Perl5Compiler.DEFAULT_MASK;
1.17 +15 -0
ant/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java
Index: JakartaOroRegexp.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JakartaOroRegexp.java 9 Mar 2004 16:48:54 - 1.16
+++ JakartaOroRegexp.java 17 Dec 2004 19:46:04 - 1.17
@@ -28,10 +28,19 @@
*/
public class JakartaOroRegexp extends JakartaOroMatcher implements Regexp {
+/** Constructor for JakartaOroRegexp */
public JakartaOroRegexp() {
super();
}
+/**
+
cvs commit: ant/src/main/org/apache/tools/ant/util/regexp RegexpUtil.java
peterreilly2004/12/17 11:51:27
Modified:src/main/org/apache/tools/ant/util/regexp RegexpUtil.java
Log:
1.6.2 version of class was not final
Revision ChangesPath
1.13 +1 -3
ant/src/main/org/apache/tools/ant/util/regexp/RegexpUtil.java
Index: RegexpUtil.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/regexp/RegexpUtil.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RegexpUtil.java 17 Dec 2004 19:46:04 - 1.12
+++ RegexpUtil.java 17 Dec 2004 19:51:27 - 1.13
@@ -20,9 +20,7 @@
* Regular expression utilities class which handles flag operations.
*
*/
-public final class RegexpUtil {
-private RegexpUtil() {
-}
+public class RegexpUtil {
/**
* Check the options has a particular flag set.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/util/regexp JakartaOroMatcher.java JakartaOroRegexp.java JakartaRegexpMatcher.java JakartaRegexpRegexp.java Jdk14RegexpMatcher.java Jdk14RegexpRegexp.java Regexp.java RegexpFactory.java RegexpMatcher.java RegexpMatcherFactory.java RegexpUtil.java
peterreilly2004/12/17 11:52:14
Modified:src/main/org/apache/tools/ant/util/regexp Tag: ANT_16_BRANCH
JakartaOroMatcher.java JakartaOroRegexp.java
JakartaRegexpMatcher.java JakartaRegexpRegexp.java
Jdk14RegexpMatcher.java Jdk14RegexpRegexp.java
Regexp.java RegexpFactory.java RegexpMatcher.java
RegexpMatcherFactory.java RegexpUtil.java
Log:
sync
Revision ChangesPath
No revision
No revision
1.13.2.5 +32 -2
ant/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
Index: JakartaOroMatcher.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java,v
retrieving revision 1.13.2.4
retrieving revision 1.13.2.5
diff -u -r1.13.2.4 -r1.13.2.5
--- JakartaOroMatcher.java9 Mar 2004 17:01:59 - 1.13.2.4
+++ JakartaOroMatcher.java17 Dec 2004 19:52:13 - 1.13.2.5
@@ -34,11 +34,15 @@
protected final Perl5Compiler compiler = new Perl5Compiler();
protected final Perl5Matcher matcher = new Perl5Matcher();
+/**
+ * Constructor for JakartaOroMatcher.
+ */
public JakartaOroMatcher() {
}
/**
* Set the regexp pattern from the String description.
+ * @param pattern the pattern to match
*/
public void setPattern(String pattern) {
this.pattern = pattern;
@@ -46,6 +50,7 @@
/**
* Get a String representation of the regexp pattern
+ * @return the pattern
*/
public String getPattern() {
return this.pattern;
@@ -53,6 +58,9 @@
/**
* Get a compiled representation of the regexp pattern
+ * @param options the options
+ * @return the compiled pattern
+ * @throws BuildException on error
*/
protected Pattern getCompiledPattern(int options)
throws BuildException {
@@ -66,7 +74,10 @@
}
/**
- * Does the given argument match the pattern?
+ * Does the given argument match the pattern using default options?
+ * @param argument the string to match against
+ * @return true if the pattern matches
+ * @throws BuildException on error
*/
public boolean matches(String argument) throws BuildException {
return matches(argument, MATCH_DEFAULT);
@@ -74,6 +85,10 @@
/**
* Does the given argument match the pattern?
+ * @param input the string to match against
+ * @param options the regex options to use
+ * @return true if the pattern matches
+ * @throws BuildException on error
*/
public boolean matches(String input, int options)
throws BuildException {
@@ -82,10 +97,15 @@
}
/**
- * Returns a Vector of matched groups found in the argument.
+ * Returns a Vector of matched groups found in the argument
+ * using default options.
*
* pGroup 0 will be the full match, the rest are the
* parenthesized subexpressions/p.
+ *
+ * @param argument the string to match against
+ * @return the vector of groups
+ * @throws BuildException on error
*/
public Vector getGroups(String argument) throws BuildException {
return getGroups(argument, MATCH_DEFAULT);
@@ -96,6 +116,11 @@
*
* pGroup 0 will be the full match, the rest are the
* parenthesized subexpressions/p.
+ *
+ * @param input the string to match against
+ * @param options the regex options to use
+ * @return the vector of groups
+ * @throws BuildException on error
*/
public Vector getGroups(String input, int options)
throws BuildException {
@@ -116,6 +141,11 @@
return v;
}
+/**
+ * Convert the generic options to the regex compiler specific options.
+ * @param options the generic options
+ * @return the specific options
+ */
protected int getCompilerOptions(int options) {
int cOptions = Perl5Compiler.DEFAULT_MASK;
1.12.2.5 +15 -0
ant/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java
Index: JakartaOroRegexp.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java,v
retrieving revision 1.12.2.4
retrieving revision 1.12.2.5
diff -u -r1.12.2.4 -r1.12.2.5
--- JakartaOroRegexp.java 9 Mar 2004 17:01:59 - 1.12.2.4
+++ JakartaOroRegexp.java 17 Dec 2004 19:52:13 - 1.12.2.5
@@ -28,10 +28,19 @@
*/
public class JakartaOroRegexp extends JakartaOroMatcher implements Regexp {
+
cvs commit: ant/src/main/org/apache/tools/ant/dispatch DispatchTask.java
mbenson 2004/12/17 12:33:54
Modified:src/main/org/apache/tools/ant/dispatch DispatchTask.java
Log:
Spelling
Revision ChangesPath
1.3 +2 -2
ant/src/main/org/apache/tools/ant/dispatch/DispatchTask.java
Index: DispatchTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/dispatch/DispatchTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DispatchTask.java 10 Jun 2004 18:01:47 - 1.2
+++ DispatchTask.java 17 Dec 2004 20:33:54 - 1.3
@@ -20,7 +20,7 @@
/**
* Tasks extending this class may contain multiple actions.
- * The method that is invoked for executoin depends upon the
+ * The method that is invoked for execution depends upon the
* value of the action attribute of the task.
* br/
* Example:br/
@@ -43,4 +43,4 @@
public String getAction() {
return action;
}
-}
\ No newline at end of file
+}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
