cvs commit: ant/xdocs contributors.xml
ddevienne2004/11/21 10:22:37 Modified:xdocscontributors.xml Log: Add my blurb, testing write access to repo. --DD Revision ChangesPath 1.31 +10 -0 ant/xdocs/contributors.xml Index: contributors.xml === RCS file: /home/cvs/ant/xdocs/contributors.xml,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- contributors.xml 20 Oct 2004 00:42:33 - 1.30 +++ contributors.xml 21 Nov 2004 18:22:37 - 1.31 @@ -180,6 +180,16 @@ /p p +bDominique Devienne/b (ddevienne at apache.org) +br/ +Dominique has been involved non-stop with the Ant user community since +the 1.4 days, trying without success to answer posts as well or as often +as Diane Holt after she left the user list. He is opiniated (to a fault +sometimes), but always striving for the best possible design. Dominique +currently works for a href=http://www.lgc.com;Landmark Graphics/a. +/p + +p bPeter Donald/b (peter at apache.org) br/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs contributors.html
bodewig 2004/11/22 00:16:16 Modified:docs contributors.html Log: regenerate site Revision ChangesPath 1.51 +9 -0 ant/docs/contributors.html Index: contributors.html === RCS file: /home/cvs/ant/docs/contributors.html,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- contributors.html 18 Nov 2004 12:22:18 - 1.50 +++ contributors.html 22 Nov 2004 08:16:16 - 1.51 @@ -314,6 +314,15 @@ bDarrell DeBoer/bbr / /p p +bDominique Devienne/b (ddevienne at apache.org) +br / +Dominique has been involved non-stop with the Ant user community since +the 1.4 days, trying without success to answer posts as well or as often +as Diane Holt after she left the user list. He is opiniated (to a fault +sometimes), but always striving for the best possible design. Dominique +currently works for a href=http://www.lgc.com;Landmark Graphics/a. +/p +p bPeter Donald/b (peter at apache.org) br / - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/xdocs contributors.xml
On 21 Nov 2004, [EMAIL PROTECTED] wrote: Add my blurb, testing write access to repo. --DD welcome. Now you need to learn that running ant -f docs.xml regenerates the site so that you can actually see your changes online 8-) Done for now. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/zip ZipEntry.java
bodewig 2004/11/22 01:23:38 Modified:src/etc ant-update.xsl src/main/org/apache/tools/ant AntClassLoader.java ComponentHelper.java Diagnostics.java DirectoryScanner.java IntrospectionHelper.java Project.java TaskAdapter.java src/main/org/apache/tools/ant/dispatch DispatchUtils.java src/main/org/apache/tools/ant/filters/util ChainReaderHelper.java src/main/org/apache/tools/ant/taskdefs Ant.java Apt.java Checksum.java Echo.java ExecTask.java Execute.java Exit.java Expand.java Get.java Jar.java Java.java LoadProperties.java Move.java PathConvert.java RecorderEntry.java Redirector.java Rmic.java SignJar.java SubAnt.java Sync.java XSLTProcess.java Zip.java src/main/org/apache/tools/ant/taskdefs/compilers AptExternalCompilerAdapter.java DefaultCompilerAdapter.java Gcj.java JavacExternal.java src/main/org/apache/tools/ant/taskdefs/cvslib CvsTagEntry.java src/main/org/apache/tools/ant/taskdefs/optional EchoProperties.java NetRexxC.java ReplaceRegExp.java XMLValidateTask.java src/main/org/apache/tools/ant/taskdefs/optional/condition IsPingable.java src/main/org/apache/tools/ant/taskdefs/optional/depend Depend.java src/main/org/apache/tools/ant/taskdefs/optional/dotnet CSharp.java Ildasm.java ImportTypelib.java NetCommand.java WsdlToDotnet.java src/main/org/apache/tools/ant/taskdefs/optional/extension Specification.java src/main/org/apache/tools/ant/taskdefs/optional/image Image.java src/main/org/apache/tools/ant/taskdefs/optional/j2ee WebLogicHotDeploymentTool.java src/main/org/apache/tools/ant/taskdefs/optional/javacc JJDoc.java JavaCC.java src/main/org/apache/tools/ant/taskdefs/optional/jsp JspC.java src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers JasperC.java src/main/org/apache/tools/ant/taskdefs/optional/junit JUnitTask.java JUnitTestRunner.java OutErrSummaryJUnitResultFormatter.java XMLConstants.java XMLJUnitResultFormatter.java Xalan1Executor.java Xalan2Executor.java XalanExecutor.java src/main/org/apache/tools/ant/taskdefs/optional/net RExecTask.java TelnetTask.java src/main/org/apache/tools/ant/taskdefs/optional/ssh AbstractSshMessage.java Scp.java ScpFromMessage.java ScpToMessage.java src/main/org/apache/tools/ant/taskdefs/optional/starteam StarTeamCheckout.java StarTeamList.java TreeBasedTask.java src/main/org/apache/tools/ant/taskdefs/optional/unix Symlink.java src/main/org/apache/tools/ant/taskdefs/repository AssertDownloaded.java BaseLibraryPolicy.java HttpRepository.java Libraries.java Library.java LibraryPolicy.java MavenRepository.java Repository.java RepositoryRef.java ScheduledUpdatePolicy.java src/main/org/apache/tools/ant/taskdefs/rmic ForkingSunRmic.java KaffeRmic.java RmicAdapterFactory.java SunRmic.java src/main/org/apache/tools/ant/types Assertions.java CommandlineJava.java DataType.java Mapper.java Permissions.java RedirectorElement.java src/main/org/apache/tools/ant/types/optional/depend DependScanner.java src/main/org/apache/tools/ant/types/selectors/modifiedselector ModifiedSelector.java src/main/org/apache/tools/ant/util ChainedMapper.java CompositeMapper.java ConcatFileInputStream.java ContainerMapper.java FileUtils.java JavaEnvUtils.java ReaderInputStream.java ResourceUtils.java src/main/org/apache/tools/zip ZipEntry.java Log: Various checkstyle violations Submitted by: Larry Shatzer And some (untabify
DO NOT REPLY [Bug 32126] - Condition IsSigned to check if a jarfile is signed
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=32126. 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=32126 --- Additional Comments From [EMAIL PROTECTED] 2004-11-22 11:11 --- Committed the condition (with some checkstyle changes), split into ConditionAndTask abstract class, and the IsSigned task. Added a signedSelector which uses the signed condition to filter files. Leaving this open as we need to add documentation and unit tests. (The only signed jars in a jre distribution seem to be the jce jars?) -- 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/selectors SignedSelector.java
peterreilly2004/11/22 02:07:22
Modified:.WHATSNEW
src/main/org/apache/tools/ant/taskdefs defaults.properties
src/main/org/apache/tools/ant/types defaults.properties
Added: src/main/org/apache/tools/ant/taskdefs IsSigned.java
ConditionAndTask.java
src/main/org/apache/tools/ant/types/selectors
SignedSelector.java
Log:
Added isSigned condition and task and signedselector selector
PR: 32126
Obtained from: Tarlika Elisabeth Schmitz
Revision ChangesPath
1.687 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.686
retrieving revision 1.687
diff -u -r1.686 -r1.687
--- WHATSNEW 18 Nov 2004 09:48:59 - 1.686
+++ WHATSNEW 22 Nov 2004 10:07:22 - 1.687
@@ -89,6 +89,9 @@
* apply has a new force attribute that, when true, disables
checking of target files.
+* Added isSigned condition and task, and signedselector selector
+ Bugzilla report 32126.
+
Changes from Ant 1.6.2 to current Ant 1.6 CVS version
=
1.161 +1 -0
ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties
Index: defaults.properties
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- defaults.properties 18 Nov 2004 16:25:03 - 1.160
+++ defaults.properties 22 Nov 2004 10:07:22 - 1.161
@@ -80,6 +80,7 @@
presetdef=org.apache.tools.ant.taskdefs.PreSetDef
macrodef=org.apache.tools.ant.taskdefs.MacroDef
nice=org.apache.tools.ant.taskdefs.Nice
+issigned=org.apache.tools.ant.taskdefs.IsSigned
libraries=org.apache.tools.ant.taskdefs.repository.Libraries
# optional tasks
1.1 ant/src/main/org/apache/tools/ant/taskdefs/IsSigned.java
Index: IsSigned.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.taskdefs;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import java.io.File;
import java.io.IOException;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.Enumeration;
/**
* Checks whether a jarfile is signed: if the name of the
* signature is passed, the file is checked for presence of that
* particular signature; otherwise the file is checked for the
* existence of any signature.
*/
public class IsSigned extends ConditionAndTask {
private static final String SIG_START = META-INF/;
private static final String SIG_END = .SF;
private String name;
private File file;
/**
* The jarfile that is to be tested for the presence
* of a signature.
*
* @param file jarfile to be tested.
*/
public void setFile(File file) {
this.file = file;
}
/**
* The signature name to check jarfile for.
*
* @param name signature to look for.
*/
public void setName(String name) {
this.name = name;
}
/**
* Returns CODEtrue/code if the file exists and is signed with
* the signature specified, or, if CODEname/code wasn't
* specified, if the file contains a signature.
* @return true if the file is signed.
*/
protected boolean evaluate() {
if (file == null) {
throw new BuildException(The file attribute must be set.);
}
if (file != null !file.exists()) {
log(The file \ + file.getAbsolutePath()
+ \ does not exist., Project.MSG_VERBOSE);
return false;
}
ZipFile jarFile = null;
try {
jarFile = new ZipFile(file);
if (null == name) {
Enumeration entries = jarFile.entries();
while (entries.hasMoreElements()) {
String name =
Re: cvs commit: ant/src/main/org/apache/tools/ant/types/selectors SignedSelector.java
On 22 Nov 2004, [EMAIL PROTECTED] wrote:
Index: ConditionAndTask.java
protected abstract boolean evaluate();
/**
* This method evaluates the condition. It calls evaluate in
* the derived class. It sets the property if a property is
* present and if the evaluate returns true. @return true if
* the condition passes, false otherwise. */
public boolean eval() {
if (evaluate()) {
if (property != null) {
getProject().setNewProperty(property, value);
}
return true;
} else {
return false;
}
}
Why do you introduce an additional abstract method?
Wouldn't it be easier to place the logic of your eval into execute()
directly and force subclasses to implement eval() just as they'd do as
plain conditions anyway?
I'm a bit uncomfortable with ConditionAndTask in general, but that's a
separate issue from the above.
The other issue simply is: why do we need it?
What's wrong with
condition property=... ...
foo/
/condition
Why do we need an additional foo task? available and the other
tasks that can be conditions as well have simply been there before
condition was added, I don't really see why we should add more
property setting tasks.
Stefan
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/main/org/apache/tools/ant/types/selectors SignedSelector.java
Stefan Bodewig wrote:
On 22 Nov 2004, [EMAIL PROTECTED] wrote:
Index: ConditionAndTask.java
protected abstract boolean evaluate();
/**
* This method evaluates the condition. It calls evaluate in
* the derived class. It sets the property if a property is
* present and if the evaluate returns true. @return true if
* the condition passes, false otherwise. */
public boolean eval() {
if (evaluate()) {
if (property != null) {
getProject().setNewProperty(property, value);
}
return true;
} else {
return false;
}
}
Why do you introduce an additional abstract method?
Wouldn't it be easier to place the logic of your eval into execute()
directly and force subclasses to implement eval() just as they'd do as
plain conditions anyway?
I wanted to separate the property handing logic from the conditon code.
I'm a bit uncomfortable with ConditionAndTask in general, but that's a
separate issue from the above.
The other issue simply is: why do we need it?
What's wrong with
condition property=... ...
foo/
/condition
Mmm..., you do have a point...
This does make more sense..
I will make the changes.
Peter
Why do we need an additional foo task? available and the other
tasks that can be conditions as well have simply been there before
condition was added, I don't really see why we should add more
property setting tasks.
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]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/condition IsSigned.java
peterreilly2004/11/22 02:48:57
Modified:src/main/org/apache/tools/ant/types/selectors
SignedSelector.java
src/main/org/apache/tools/ant/types defaults.properties
src/main/org/apache/tools/ant/taskdefs defaults.properties
Added: src/main/org/apache/tools/ant/taskdefs/condition
IsSigned.java
Removed: src/main/org/apache/tools/ant/taskdefs IsSigned.java
ConditionAndTask.java
Log:
remove issigned task, make it a condition only
Revision ChangesPath
1.2 +1 -1
ant/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java
Index: SignedSelector.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SignedSelector.java 22 Nov 2004 10:07:22 - 1.1
+++ SignedSelector.java 22 Nov 2004 10:48:57 - 1.2
@@ -18,7 +18,7 @@
package org.apache.tools.ant.types.selectors;
import java.io.File;
import org.apache.tools.ant.types.DataType;
-import org.apache.tools.ant.taskdefs.IsSigned;
+import org.apache.tools.ant.taskdefs.condition.IsSigned;
/**
* Selector that chooses files based on whether they are signed or not.
1.30 +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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- defaults.properties 22 Nov 2004 10:07:22 - 1.29
+++ defaults.properties 22 Nov 2004 10:48:57 - 1.30
@@ -34,5 +34,6 @@
propertyset=org.apache.tools.ant.types.PropertySet
assertions=org.apache.tools.ant.types.Assertions
concatfilter=org.apache.tools.ant.filters.ConcatFilter
+issigned=org.apache.tools.ant.taskdefs.condition.IsSigned
ispingable=org.apache.tools.ant.taskdefs.optional.condition.IsPingable
mavenrepository=org.apache.tools.ant.taskdefs.optional.repository.MavenRepository
1.162 +0 -1
ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties
Index: defaults.properties
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- defaults.properties 22 Nov 2004 10:07:22 - 1.161
+++ defaults.properties 22 Nov 2004 10:48:57 - 1.162
@@ -80,7 +80,6 @@
presetdef=org.apache.tools.ant.taskdefs.PreSetDef
macrodef=org.apache.tools.ant.taskdefs.MacroDef
nice=org.apache.tools.ant.taskdefs.Nice
-issigned=org.apache.tools.ant.taskdefs.IsSigned
libraries=org.apache.tools.ant.taskdefs.repository.Libraries
# optional tasks
1.1
ant/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java
Index: IsSigned.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.taskdefs.condition;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.DataType;
import java.io.File;
import java.io.IOException;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.Enumeration;
/**
* Checks whether a jarfile is signed: if the name of the
* signature is passed, the file is checked for presence of that
* particular signature; otherwise the file is checked for the
* existence of any signature.
*/
public class IsSigned extends DataType implements Condition {
private static final String SIG_START = META-INF/;
private static final String SIG_END = .SF;
private String name;
private File file;
/**
* The jarfile that is to be tested for the presence
* of a signature.
*
* @param file jarfile to be tested.
*/
public void setFile(File file) {
DO NOT REPLY [Bug 32126] - Condition IsSigned to check if a jarfile is signed
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=32126. 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=32126 --- Additional Comments From [EMAIL PROTECTED] 2004-11-22 11:20 --- (In reply to comment #7) (The only signed jars in a jre distribution seem to be the jce jars?) The JavaMail jars, although not part of the JRE distribution, are signed by Sun. -- 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 32344] New: - C/C++ compile and link task
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=32344. 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=32344 Summary: C/C++ compile and link task Product: Ant Version: unspecified Platform: All OS/Version: All Status: UNCONFIRMED Severity: normal Priority: P2 Component: Core tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Can Ant provide a task to compile and link C/C++ source code? I have to compile and link my JNI program, so I hope Ant with this function. I now use 'exec' task, but it is not convenient. 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]
DO NOT REPLY [Bug 32344] - C/C++ compile and link task
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=32344. 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=32344 [EMAIL PROTECTED] changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2004-11-22 12:21 --- Yes, http://ant-contrib.sourceforge.net/cc.html -- 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/main/org/apache/tools/ant/types/selectors SignedSelector.java
On Mon, 22 Nov 2004, Peter Reilly [EMAIL PROTECTED] wrote: Why do you introduce an additional abstract method? Wouldn't it be easier to place the logic of your eval into execute() directly and force subclasses to implement eval() just as they'd do as plain conditions anyway? I wanted to separate the property handing logic from the conditon code. That's why I suggested to place it into execute 8-) Thanks for pulling the task. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/condition IsSigned.java
bodewig 2004/11/22 03:42:53
Modified:src/main/org/apache/tools/ant/taskdefs SignJar.java
src/main/org/apache/tools/ant/taskdefs/condition
IsSigned.java
Log:
* Use issigned from signjar
* Refactor issigned by moving the test into a static method so it is
easier to use from a different task.
* Avoid IndexOutOfBoundsException if name is shorter than eight characters.
Revision ChangesPath
1.39 +2 -28 ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java
Index: SignJar.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- SignJar.java 22 Nov 2004 09:23:28 - 1.38
+++ SignJar.java 22 Nov 2004 11:42:53 - 1.39
@@ -26,6 +26,7 @@
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.condition.IsSigned;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.util.JavaEnvUtils;
import org.apache.tools.ant.util.FileUtils;
@@ -338,37 +339,10 @@
* @return true if the file is signed
*/
protected boolean isSigned(File file) {
-final String SIG_START = META-INF/;
-final String SIG_END = .SF;
-
-if (!file.exists()) {
-return false;
-}
-ZipFile jarFile = null;
try {
-jarFile = new ZipFile(file);
-if (null == alias) {
-Enumeration entries = jarFile.entries();
-while (entries.hasMoreElements()) {
-String name = ((ZipEntry)
entries.nextElement()).getName();
-if (name.startsWith(SIG_START)
name.endsWith(SIG_END)) {
-return true;
-}
-}
-return false;
-} else {
-return jarFile.getEntry(SIG_START + alias.toUpperCase()
-+ SIG_END) != null;
-}
+return IsSigned.isSigned(file, alias);
} catch (IOException e) {
return false;
-} finally {
-if (jarFile != null) {
-try {
-jarFile.close();
-} catch (IOException e) {
-}
-}
}
}
}
1.2 +47 -30
ant/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java
Index: IsSigned.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IsSigned.java 22 Nov 2004 10:48:57 - 1.1
+++ IsSigned.java 22 Nov 2004 11:42:53 - 1.2
@@ -64,49 +64,35 @@
* specified, if the file contains a signature.
* @return true if the file is signed.
*/
-public boolean eval() {
-if (file == null) {
-throw new BuildException(The file attribute must be set.);
-}
-if (file != null !file.exists()) {
-log(The file \ + file.getAbsolutePath()
-+ \ does not exist., Project.MSG_VERBOSE);
-return false;
-}
-
+public static boolean isSigned(File zipFile, String name)
+throws IOException {
ZipFile jarFile = null;
try {
-jarFile = new ZipFile(file);
+jarFile = new ZipFile(zipFile);
if (null == name) {
Enumeration entries = jarFile.entries();
while (entries.hasMoreElements()) {
-String name = ((ZipEntry)
entries.nextElement()).getName();
-if (name.startsWith(SIG_START)
name.endsWith(SIG_END)) {
-log(File \ + file.getAbsolutePath()
-+ \ is signed., Project.MSG_VERBOSE);
+String eName = ((ZipEntry)
entries.nextElement()).getName();
+if (eName.startsWith(SIG_START)
+ eName.endsWith(SIG_END)) {
return true;
}
}
return false;
} else {
boolean shortSig = jarFile.getEntry(SIG_START
-+ name.toUpperCase()
-+ SIG_END) != null;
-boolean longSig = jarFile.getEntry(SIG_START
-+ name.substring(0, 8).toUpperCase()
-+
DO NOT REPLY [Bug 30517] - [signjar] : uptodate enhancements
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=30517. 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=30517 --- Additional Comments From [EMAIL PROTECTED] 2004-11-22 12:45 --- CVS HEAD now contains an issigned condition which should implement the test correctly - and signjar now uses this condition internally. Could you please download a nightly build of Ant of 2004-11-23 or later and try whether the problem has been fixed by it? -- 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 14950] - Task signjar defect
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=14950. 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=14950 [EMAIL PROTECTED] changed: What|Removed |Added OS/Version||All --- Additional Comments From [EMAIL PROTECTED] 2004-11-22 12:56 --- If you run Ant with the -verbose switch, it will log the commandline it uses to run jarsigner internally. In what way is it different from your manual invocation? -- 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 defaults.properties
bodewig 2004/11/22 03:52:39 Modified:src/main/org/apache/tools/ant/types defaults.properties Log: Fix class name, make tests pass Revision ChangesPath 1.31 +1 -1 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.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- defaults.properties 22 Nov 2004 10:48:57 - 1.30 +++ defaults.properties 22 Nov 2004 11:52:39 - 1.31 @@ -36,4 +36,4 @@ concatfilter=org.apache.tools.ant.filters.ConcatFilter issigned=org.apache.tools.ant.taskdefs.condition.IsSigned ispingable=org.apache.tools.ant.taskdefs.optional.condition.IsPingable -mavenrepository=org.apache.tools.ant.taskdefs.optional.repository.MavenRepository +mavenrepository=org.apache.tools.ant.taskdefs.repository.MavenRepository - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/main/org/apache/tools/ant/types defaults.properties
Opps, Soory, my conflict resultion got confused. Peter [EMAIL PROTECTED] wrote: bodewig 2004/11/22 03:52:39 Modified:src/main/org/apache/tools/ant/types defaults.properties Log: Fix class name, make tests pass Revision ChangesPath 1.31 +1 -1 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.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- defaults.properties 22 Nov 2004 10:48:57 - 1.30 +++ defaults.properties 22 Nov 2004 11:52:39 - 1.31 @@ -36,4 +36,4 @@ concatfilter=org.apache.tools.ant.filters.ConcatFilter issigned=org.apache.tools.ant.taskdefs.condition.IsSigned ispingable=org.apache.tools.ant.taskdefs.optional.condition.IsPingable -mavenrepository=org.apache.tools.ant.taskdefs.optional.repository.MavenRepository +mavenrepository=org.apache.tools.ant.taskdefs.repository.MavenRepository - 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 27641] - Ordering of targets affects processing of macro instance validation.
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=27641. 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=27641 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Additional Comments From [EMAIL PROTECTED] 2004-11-22 14:04 --- No, I cannot remember anything. I will mark this as works for me. Please change if it can be reproduced with ant 1.6.2 or ant cvs. -- 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: task testing style?
Both styles of testing have their merits. There are some mock objects in Ant's test infrastructure (MockBuildListener, for example). The most important thing, of course, is that tests are created that ensure that the production code is working as it should. Sure, there are more moving parts in the functional-style. Ideally there would be all flavors of testing in place to ensure all levels are functioning appropriately. There are certainly no objections about incorporating more mock-style testing into Ant's codebase. The more testing the better! The dilemma I've encountered when folks catch on to mock unit testing is that they get carried away with it and try to mock too much functionality rather than keeping it focused, at which point you end up with mock objects that are so complex that they require their own unit tests :) Erik On Nov 16, 2004, at 12:33 PM, Russell Gold wrote: The tests I have looked at in ant appear mostly to use a semi- functional test style: they use xml to define a task, run it, and then check some results (which may simply be the lack of an error). I am used to a more unit testing style, in which external classes or subsystems are stubbed out. For example, for my dependencies task, I want to confirm that a dependency is downloaded only if it is not already present, which I do by mocking the fetch mechanism. Is this approach being used somewhere in ant? Has there been any discussion of the two approaches to testing? - 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]
cvs commit: ant/src/etc/testcases/taskdefs/conditions/jars - New directory
peterreilly2004/11/22 08:19:29 ant/src/etc/testcases/taskdefs/conditions/jars - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector ModifiedSelector.java
stevel 2004/11/22 08:44:16
Modified:src/main/org/apache/tools/ant/types/selectors/modifiedselector
ModifiedSelector.java
Log:
xdoclet complains it is illegal to have comments at the end.
Revision ChangesPath
1.14 +2 -2
ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
Index: ModifiedSelector.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ModifiedSelector.java 22 Nov 2004 09:23:36 - 1.13
+++ ModifiedSelector.java 22 Nov 2004 16:44:16 - 1.14
@@ -927,5 +927,5 @@
return new String[] {equal, rule };
}
}
-
-} //class-ModifiedSelector
\ No newline at end of file
+//class-ModifiedSelector
+}
\ No newline at end of file
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector ModifiedSelector.java
On 22 Nov 2004, [EMAIL PROTECTED] wrote: xdoclet complains it is illegal to have comments at the end. xdoclet lies 8-) I'm surprised it's only been in one file, though. JDEEs default template adds a comment at the end of a class/interface for example. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
AW: cvs commit: ant/src/main/org/apache/tools/ant/types/selectors /modifiedselector ModifiedSelector.java
puh - never heard, that such a comment should be wrong ... So that´s an error in xdoclet? Jan -Ursprüngliche Nachricht- Von: Stefan Bodewig [mailto:[EMAIL PROTECTED] Gesendet am: Montag, 22. November 2004 17:53 An: [EMAIL PROTECTED] Betreff: Re: cvs commit: ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector ModifiedSelector.java On 22 Nov 2004, [EMAIL PROTECTED] wrote: xdoclet complains it is illegal to have comments at the end. xdoclet lies 8-) I'm surprised it's only been in one file, though. JDEEs default template adds a comment at the end of a class/interface for example. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: AW: cvs commit: ant/src/main/org/apache/tools/ant/types/selectors /modifiedselector ModifiedSelector.java
FWIW the ANTLR java grammars have for years had trouble with comments at EOF without EOL. IIRC it's a pain to express correctly in a grammar that a single-line comment is terminated by a newline except when it occurs at the end of the file... could be other tools have similar issues? -Matt --- [EMAIL PROTECTED] wrote: puh - never heard, that such a comment should be wrong ... So that´s an error in xdoclet? Jan -Ursprüngliche Nachricht- Von: Stefan Bodewig [mailto:[EMAIL PROTECTED] Gesendet am: Montag, 22. November 2004 17:53 An: [EMAIL PROTECTED] Betreff: Re: cvs commit: ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector ModifiedSelector.java On 22 Nov 2004, [EMAIL PROTECTED] wrote: xdoclet complains it is illegal to have comments at the end. xdoclet lies 8-) I'm surprised it's only been in one file, though. JDEEs default template adds a comment at the end of a class/interface for example. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Meet the all-new My Yahoo! - Try it today! http://my.yahoo.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 31999] - Easier way to declare externally-written tasks in build script
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=31999. 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=31999 --- Additional Comments From [EMAIL PROTECTED] 2004-11-22 17:47 --- Thanks. It took me a while to figure out the new declaration mechanism. (but I guess that's my fault --- Google found it quickly) http://ant.apache.org/manual/CoreTypes/antlib.html As of Ant 1.6.2, in the beginning of this document, there's an example that says: For example, assuming that the sample.xml is in a jar file sample.jar also containing the classes, the following build fragment will define the if and scriptpathmapper tasks/types and place them in the namespace uri samples:/acme.org. typedef resource=org/acme/ant/sample.xml uri=samples:/acme.org/ But the above sample doesn't specify where sample.jar resides, and it seems to me that unless Ant is a mind-reader, I don't see how it can find the jar files. Perhaps it's missing classpath nested elements? This looks good to me, but I think it can be simplified further by having the default resource name (/META-INF/antlib.xml ?) to load antlib.xml from, and allowing the antlib.xml to declare the URI (just like taglib.) If it's difficult to expand the typedef task to take this much default, it could be another task. This would allow build script writers to just type the following: antlibdef classpath pathelement path=lib/mytask.jar/ /classpath /antlibdef !-- the namespace URI of the task is defined by the task writer -- mt:mytask xmlns:mt=http://kohsuke.org/ant/mytask/ ... to define it. One could also consider having a special treatment like antlib: namespace URI --- for example, you can treat relative namespace URIs to jar files as if the above declaration is done. In this way, I only need to write: mt:mytask xmlns=lib/mytask.jar/ Anyway, the point that I was trying to make was that as a task developer, I'm willing to spend more efforts on writing tasks (e.g., adding xml file in a known location, making sure Class-Path manifest entry points to all the libraries), but as a build script writer, I'd like the declaration to be as simple as possible. And the way I see it, the latter can be simplified further. -- 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/etc/testcases/taskdefs/conditions issigned.xml
peterreilly2004/11/22 09:14:23
Added: src/testcases/org/apache/tools/ant/taskdefs/condition
IsSignedTest.java
src/etc/testcases/taskdefs/conditions/jars apassword.jar
nosign.jar pass.jar
src/etc/testcases/taskdefs/conditions issigned.xml
Log:
some simple tests for the issigned condition
Revision ChangesPath
1.1
ant/src/testcases/org/apache/tools/ant/taskdefs/condition/IsSignedTest.java
Index: IsSignedTest.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.taskdefs.condition;
import org.apache.tools.ant.BuildFileTest;
/**
* Testcase for the lt;issignedgt; condition.
*
*/
public class IsSignedTest extends BuildFileTest {
public IsSignedTest(String name) {
super(name);
}
public void setUp() {
configureProject(src/etc/testcases/taskdefs/conditions/issigned.xml);
}
public void testPass() {
executeTarget(pass);
}
public void testPassword() {
executeTarget(password);
}
public void testAPassword() {
executeTarget(apassword);
}
public void testAllSigned() {
executeTarget(allsigned);
}
}
1.1
ant/src/etc/testcases/taskdefs/conditions/jars/apassword.jar
Binary file
1.1 ant/src/etc/testcases/taskdefs/conditions/jars/nosign.jar
Binary file
1.1 ant/src/etc/testcases/taskdefs/conditions/jars/pass.jar
Binary file
1.1 ant/src/etc/testcases/taskdefs/conditions/issigned.xml
Index: issigned.xml
===
project default=all
target name=pass description=check if a name of pass is ok
fail message=name of pass not seen in the signed pass.jar
condition
not
issigned file=jars/pass.jar name=pass/
/not
/condition
/fail
/target
target name=password description=check if a name of password is *not*
ok
fail message=name of password is seen in the signed pass.jar
condition
issigned file=jars/pass.jar name=password/
/condition
/fail
/target
target name=apassword description=check if the 8 letter shorting works
fail message=8 letter shorting does not work 1
condition
not
issigned file=jars/apassword.jar name=apasswor/
/not
/condition
/fail
fail message=8 letter shorting does not work 2
condition
not
issigned file=jars/apassword.jar name=apassword/
/not
/condition
/fail
/target
target name=allsigned description=check the signed / not signed status
fail message=pass.jar should be signed
condition
not
issigned file=jars/pass.jar/
/not
/condition
/fail
fail message=nosign.jar should not be signed
condition
issigned file=jars/nosign.jar/
/condition
/fail
fail message=apassword.jar should be signed
condition
not
issigned file=jars/apassword.jar/
/not
/condition
/fail
/target
/project
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 31999] - Easier way to declare externally-written tasks in build script
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=31999. 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=31999 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Additional Comments From [EMAIL PROTECTED] 2004-11-22 18:34 --- I don't think you've gotten all the antlib usages. You mentioned where does the typedef know where to find tasks/types. taskdef and thus typedef is/are documented as accepting one of five (I think) classpath specifications, or default locations (ANT_HOME/lib for one) are used. Next, if all antlib.xml files existed at the same resource location it would make retrieving them much more difficult than a simple getResource call because you'd have to look in every jar. Having antlib URLs allows the construction of different locations for antlib.xml and puts the task of finding the appropriate resource onto the JVM. It also means you can (if you wanted to) bundle multiple antlibs into a single archive. Next you propose that the task writer define the namespace uri. I'm no expert on XML namespace theory but at the very least you could say that if two tasks were defined by their respective authors to live in the same uri with the same taskname (not entirely improbable) the innocent user might have trouble using the competing tasks together. As for simplicity, I most often use the project xmlns:foo=antlib:org.foo approach. Having the user declare the namespace is not unreasonable and I expect shields us from numerous bug reports by virtue of requiring that the user know what he or she is doing. Please feel free to post to the user list if you need further help with antlibs. Thanks, Matt -- 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 31999] - Easier way to declare externally-written tasks in build script
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=31999. 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=31999 [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|WORKSFORME | --- Additional Comments From [EMAIL PROTECTED] 2004-11-22 18:50 --- It has always been my intention to make the antlib resolution be a little easier (under the name antlibresolve - however the marc.theaimsgroup.com seach function seems to be broken at the moment), so I am reopening this. Using an antlib.xml in the meta-inf has been discussed before and rejected for various reasons. One idea to make the script writer work be a little easier would be to map: typedef antlib=antlib:org.me.tasks classpath path=me.jar/ /typedef to typedef uri=antlib:org.me.tasks resource=org/me/tasks/antlib.xml classpath path=me.jar/ /typedef -- 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/main/org/apache/tools/ant/types/selectors/modifiedselector ModifiedSelector.java
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] puh - never heard, that such a comment should be wrong ... So that´s an error in xdoclet? Actually, it's true. The JLS at one point specified that the last line of a file shouldn't end with a comment without a trailing line ending (\n). We even had compile failure with SUN's Javac 1.4.x on Linux, and had to add a bunch of empty lines after such comments. Now the SUN compilers are back to being more lenient about this, and maybe even the spec was update!? --DD -Ursprüngliche Nachricht- Von: Stefan Bodewig [mailto:[EMAIL PROTECTED] On 22 Nov 2004, [EMAIL PROTECTED] wrote: xdoclet complains it is illegal to have comments at the end. xdoclet lies 8-) I'm surprised it's only been in one file, though. JDEEs default template adds a comment at the end of a class/interface for example. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/util FileUtils.java
peterreilly2004/11/22 10:18:42
Modified:src/main/org/apache/tools/ant/util FileUtils.java
Log:
checkstyle changes
Obtained from: Kevin Jackson
Revision ChangesPath
1.73 +3 -3 ant/src/main/org/apache/tools/ant/util/FileUtils.java
Index: FileUtils.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/FileUtils.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- FileUtils.java22 Nov 2004 09:23:37 - 1.72
+++ FileUtils.java22 Nov 2004 18:18:42 - 1.73
@@ -30,10 +30,8 @@
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Reader;
-import java.io.PrintWriter;
import java.io.Writer;
import java.io.OutputStream;
-import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
import java.text.CharacterIterator;
@@ -1121,6 +1119,7 @@
*
* @param f the file to be created
* @return true if the file did not exist already.
+ * @throws IOException on error
* @since Ant 1.5
*/
public boolean createNewFile(File f) throws IOException {
@@ -1138,6 +1137,7 @@
* @param name the name of the file to test.
*
* @return true if the file is a symbolic link.
+ * @throws IOException on error
* @since Ant 1.5
*/
public boolean isSymbolicLink(File parent, String name)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 31999] - Easier way to declare externally-written tasks in build script
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=31999. 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=31999 --- Additional Comments From [EMAIL PROTECTED] 2004-11-22 19:19 --- The above doesn't really speak to me but I will wait for more concrete proposals before I comment further. :) -- 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 31999] - Easier way to declare externally-written tasks in build script
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=31999. 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=31999 --- Additional Comments From [EMAIL PROTECTED] 2004-11-22 19:20 --- Thank you for your comment, Matt. Next, if all antlib.xml files existed at the same resource location it would make retrieving them much more difficult than a simple getResource call because you'd have to look in every jar. Having antlib URLs allows the construction of different locations for antlib.xml and puts the task of finding the appropriate resource onto the JVM. It also means you can (if you wanted to) bundle multiple antlibs into a single archive. Loading resources from the same location is a well established practice in Java, and JVM allows you to enumerate all the resources given a ClassLoader. While it does make the code in Ant bit longer, but that's not a significant complication. Next you propose that the task writer define the namespace uri. I'm no expert on XML namespace theory but at the very least you could say that if two tasks were defined by their respective authors to live in the same uri with the same taskname (not entirely improbable) the innocent user might have trouble using the competing tasks together. I've been a member of a few XML related WGs/TCs in W3C/OASIS, so I know a thing or two about XML namspaces. The point of using the namespace URI is to make it almost impossible to have unexpected collisions. So I can say that this will never be a problem. As an example, think about taglib. You are not allowed to have two taglibs in the same URI, but this has never been an issue. As for simplicity, I most often use the project xmlns:foo=antlib:org.foo approach. Having the user declare the namespace is not unreasonable and I expect shields us from numerous bug reports by virtue of requiring that the user know what he or she is doing. I agree that asking the user to declare the namespace is not unreasonable. Indeed in my proposal, the user would have to declare the namespace. The problem that I'm having with xmlns:foo=antlib:org.foo is that it requires task classes to be available as a part of the current user's settings (such as $ANT_HOME/lib and a few other places, as you kindly pointed out) This makes it impossible to tell people to cvs co and then ant -- they have to now update their own environment to include my task jars. This is more complicated than I'd prefer. -- 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 31999] - Easier way to declare externally-written tasks in build script
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=31999. 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=31999 --- Additional Comments From [EMAIL PROTECTED] 2004-11-22 19:22 --- Thanks for the pointer to the archive. I'll read them later. typedef antlib=antlib:org.me.tasks classpath path=me.jar/ /typedef This works for me. This requires the absolute minimum from build script writers. -- 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 21657] - CVS Task - Not working with passfile
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=21657. 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=21657 [EMAIL PROTECTED] changed: What|Removed |Added OS/Version||All --- Additional Comments From [EMAIL PROTECTED] 2004-11-22 21:04 --- It's not a CVSNT bug but rather an intentional omission as they seem to prefer storing passwords in the windows registry. For those like me who spent way too much time trying to figure out a supported CVSNT workaround for this: Instead of using the cvspass task and passfile attributes on your cvs task just add the password to your repository path like so: :pserver:USER:[EMAIL PROTECTED]:/path/to/cvsroot or I suppose you could put the passfile contents in the registry directly if you needed to do it that way (for instance, if you only had access to a passfile and not the password itself): HKEY_CURRENT_USER\Software\cvsnt\cvspass A note in the ant documentation for the cvs passfile attribute might be appropriate. -- 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 29027] - Classpath elements within taskdefs ignored when in Antlib
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=29027. 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=29027 [EMAIL PROTECTED] changed: What|Removed |Added Severity|normal |major Summary|Classpath elements within |Classpath elements within |taskdefs ignored when in|taskdefs ignored when in |Antlib |Antlib -- 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 30339] - Jar task can create mysteriously broken jar files in 1.5.1, 1.6.2
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=30339. 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=30339 --- Additional Comments From [EMAIL PROTECTED] 2004-11-22 23:25 --- Surely. But it would be appropriate to document that the default setting (add) can generate Jar files that will mysteriously fail to work in certain deployments if duplicate files are actually included in the Jar file. Such a documentation note would have saved me months of confusion and misery. -- 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/CoreTasks zip.html jar.html war.html ear.html
mbenson 2004/11/22 14:53:50 Modified:docs/manual/CoreTasks zip.html jar.html war.html ear.html Log: Added warnings regarding duplicate files to zip and family. PR: 30339 Revision ChangesPath 1.27 +6 -0 ant/docs/manual/CoreTasks/zip.html Index: zip.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/zip.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- zip.html 19 Nov 2004 09:07:09 - 1.26 +++ zip.html 22 Nov 2004 22:53:50 - 1.27 @@ -67,6 +67,12 @@ implementation of the zip and unzip commands - these are the default versions of zip and unzip for many Unix and Unix-like systems./p +pbPlease note that the zip format allows multiple files of the same +fully-qualified name to exist within a single archive. This has been +documented as causing various problems for unsuspecting users. If you wish +to avoid this behavior you must set the codeduplicate/code attribute +to a value other than its default, codequot;addquot;/code./b/p + h3Parameters/h3 table border=1 cellpadding=2 cellspacing=0 tr 1.33 +6 -0 ant/docs/manual/CoreTasks/jar.html Index: jar.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/jar.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- jar.html 25 May 2004 11:48:20 - 1.32 +++ jar.html 22 Nov 2004 22:53:50 - 1.33 @@ -54,6 +54,12 @@ being wrapped and continued on the next line. /p +pbPlease note that the zip format allows multiple files of the same +fully-qualified name to exist within a single archive. This has been +documented as causing various problems for unsuspecting users. If you wish +to avoid this behavior you must set the codeduplicate/code attribute +to a value other than its default, codequot;addquot;/code./b/p + h3Parameters/h3 table border=1 cellpadding=2 cellspacing=0 tr 1.24 +6 -0 ant/docs/manual/CoreTasks/war.html Index: war.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/war.html,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- war.html 25 May 2004 11:48:20 - 1.23 +++ war.html 22 Nov 2004 22:53:50 - 1.24 @@ -18,6 +18,12 @@ attributes of zipfilesets in a Zip or Jar task.)/p pThe extended zipfileset element from the zip task (with attributes iprefix/i, ifullpath/i, and isrc/i) is available in the War task./p +pbPlease note that the zip format allows multiple files of the same +fully-qualified name to exist within a single archive. This has been +documented as causing various problems for unsuspecting users. If you wish +to avoid this behavior you must set the codeduplicate/code attribute +to a value other than its default, codequot;addquot;/code./b/p + h3Parameters/h3 table border=1 cellpadding=2 cellspacing=0 tr 1.20 +6 -0 ant/docs/manual/CoreTasks/ear.html Index: ear.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/ear.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ear.html 25 May 2004 11:48:20 - 1.19 +++ ear.html 22 Nov 2004 22:53:50 - 1.20 @@ -16,6 +16,12 @@ attributes of zipfilesets in a Zip or Jar task.)/p pThe extended zipfileset element from the zip task (with attributes iprefix/i, ifullpath/i, and isrc/i) is available in the Ear task./p +pbPlease note that the zip format allows multiple files of the same +fully-qualified name to exist within a single archive. This has been +documented as causing various problems for unsuspecting users. If you wish +to avoid this behavior you must set the codeduplicate/code attribute +to a value other than its default, codequot;addquot;/code./b/p + h3Parameters/h3 table border=1 cellpadding=2 cellspacing=0 tr - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks zip.html war.html ear.html jar.html
mbenson 2004/11/22 14:55:10 Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH zip.html war.html ear.html jar.html Log: Merge Revision ChangesPath No revision No revision 1.21.2.6 +6 -0 ant/docs/manual/CoreTasks/zip.html Index: zip.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/zip.html,v retrieving revision 1.21.2.5 retrieving revision 1.21.2.6 diff -u -r1.21.2.5 -r1.21.2.6 --- zip.html 19 Nov 2004 09:10:00 - 1.21.2.5 +++ zip.html 22 Nov 2004 22:55:10 - 1.21.2.6 @@ -68,6 +68,12 @@ implementation of the zip and unzip commands - these are the default versions of zip and unzip for many Unix and Unix-like systems./p +pbPlease note that the zip format allows multiple files of the same +fully-qualified name to exist within a single archive. This has been +documented as causing various problems for unsuspecting users. If you wish +to avoid this behavior you must set the codeduplicate/code attribute +to a value other than its default, codequot;addquot;/code./b/p + h3Parameters/h3 table border=1 cellpadding=2 cellspacing=0 tr 1.20.2.4 +6 -0 ant/docs/manual/CoreTasks/war.html Index: war.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/war.html,v retrieving revision 1.20.2.3 retrieving revision 1.20.2.4 diff -u -r1.20.2.3 -r1.20.2.4 --- war.html 25 May 2004 11:48:35 - 1.20.2.3 +++ war.html 22 Nov 2004 22:55:10 - 1.20.2.4 @@ -19,6 +19,12 @@ attributes of zipfilesets in a Zip or Jar task.)/p pThe extended zipfileset element from the zip task (with attributes iprefix/i, ifullpath/i, and isrc/i) is available in the War task./p +pbPlease note that the zip format allows multiple files of the same +fully-qualified name to exist within a single archive. This has been +documented as causing various problems for unsuspecting users. If you wish +to avoid this behavior you must set the codeduplicate/code attribute +to a value other than its default, codequot;addquot;/code./b/p + h3Parameters/h3 table border=1 cellpadding=2 cellspacing=0 tr 1.16.2.4 +6 -0 ant/docs/manual/CoreTasks/ear.html Index: ear.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/ear.html,v retrieving revision 1.16.2.3 retrieving revision 1.16.2.4 diff -u -r1.16.2.3 -r1.16.2.4 --- ear.html 25 May 2004 11:48:35 - 1.16.2.3 +++ ear.html 22 Nov 2004 22:55:10 - 1.16.2.4 @@ -17,6 +17,12 @@ attributes of zipfilesets in a Zip or Jar task.)/p pThe extended zipfileset element from the zip task (with attributes iprefix/i, ifullpath/i, and isrc/i) is available in the Ear task./p +pbPlease note that the zip format allows multiple files of the same +fully-qualified name to exist within a single archive. This has been +documented as causing various problems for unsuspecting users. If you wish +to avoid this behavior you must set the codeduplicate/code attribute +to a value other than its default, codequot;addquot;/code./b/p + h3Parameters/h3 table border=1 cellpadding=2 cellspacing=0 tr 1.28.2.5 +6 -0 ant/docs/manual/CoreTasks/jar.html Index: jar.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/jar.html,v retrieving revision 1.28.2.4 retrieving revision 1.28.2.5 diff -u -r1.28.2.4 -r1.28.2.5 --- jar.html 25 May 2004 11:48:35 - 1.28.2.4 +++ jar.html 22 Nov 2004 22:55:10 - 1.28.2.5 @@ -55,6 +55,12 @@ being wrapped and continued on the next line. /p +pbPlease note that the zip format allows multiple files of the same +fully-qualified name to exist within a single archive. This has been +documented as causing various problems for unsuspecting users. If you wish +to avoid this behavior you must set the codeduplicate/code attribute +to a value other than its default, codequot;addquot;/code./b/p + h3Parameters/h3 table border=1 cellpadding=2 cellspacing=0 tr - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30339] - insufficient emphasis placed on duplicate attribute of zip co. WAS Jar task can create mysteriously broken jar files in 1.5.1, 1.6.2
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=30339. 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=30339 [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Component|Core tasks |Documentation Resolution|INVALID | Summary|Jar task can create |insufficient emphasis placed |mysteriously broken jar |on duplicate attribute of |files in 1.5.1, 1.6.2 |zip co. WAS Jar task can ||create mysteriously broken ||jar files in 1.5.1, 1.6.2 -- 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 30339] - insufficient emphasis placed on duplicate attribute of zip co. WAS Jar task can create mysteriously broken jar files in 1.5.1, 1.6.2
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=30339. 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=30339 [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-11-22 23:58 --- Added warnings for zip, jar, war and ear in CVS. Thanks, Matt -- 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]
